From ffa4bbe4665f95bab7779ded57d6a4de13cb8ffc Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 9 Mar 2018 11:57:52 +1100 Subject: st/nir/radeonsi: move nir_lower_uniforms_to_ubo() to the state tracker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will only ever be used by gallium drivers so it probably doesn't belong in the nir toolkit. Also we want to pass it some non NIR things in the following patch. To avoid regressions we wrap the lowering calls that have been moved to st_glsl_to_nir with a quick hack so that they are only called for radeonsi, we will replace the hack with a check for uniform packing in a following patch. Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader_nir.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index acb796b331c..7f17affa4d3 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -32,12 +32,6 @@ #include "compiler/nir_types.h" -static int -type_size(const struct glsl_type *type) -{ - return glsl_count_attribute_slots(type, false); -} - static void scan_instruction(struct tgsi_shader_info *info, nir_instr *instr) { @@ -650,10 +644,6 @@ si_lower_nir(struct si_shader_selector* sel) * - ensure constant offsets for texture instructions are folded * and copy-propagated */ - NIR_PASS_V(sel->nir, nir_lower_io, nir_var_uniform, type_size, - (nir_lower_io_options)0); - NIR_PASS_V(sel->nir, nir_lower_uniforms_to_ubo); - NIR_PASS_V(sel->nir, nir_lower_returns); NIR_PASS_V(sel->nir, nir_lower_vars_to_ssa); NIR_PASS_V(sel->nir, nir_lower_alu_to_scalar); -- cgit v1.2.3