Blorp doesn't use uniform push constants anymore so there's no need to
support them in compile_nir_shader.
Signed-off-by: Jason Ekstrand <ja...@jlekstrand.net>
---
src/intel/blorp/blorp.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c
index 9d175ae..2f27274 100644
--- a/src/intel/blorp/blorp.c
+++ b/src/intel/blorp/blorp.c
@@ -141,16 +141,6 @@ brw_blorp_init_wm_prog_key(struct brw_wm_prog_key *wm_key)
wm_key->tex.swizzles[i] = SWIZZLE_XYZW;
}
-static int
-nir_uniform_type_size(const struct glsl_type *type)
-{
- /* Only very basic types are allowed */
- assert(glsl_type_is_vector_or_scalar(type));
- assert(glsl_get_bit_size(type) == 32);
-
- return glsl_get_vector_elements(type) * 4;
-}
-
const unsigned *
brw_blorp_compile_nir_shader(struct blorp_context *blorp, struct nir_shader
*nir,
const struct brw_wm_prog_key *wm_key,
@@ -184,19 +174,6 @@ brw_blorp_compile_nir_shader(struct blorp_context *blorp,
struct nir_shader *nir
nir_remove_dead_variables(nir, nir_var_shader_in);
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
- /* Uniforms are required to be lowered before going into compile_fs. For
- * BLORP, we'll assume that whoever builds the shader sets the location
- * they want so we just need to lower them and figure out how many we have
- * in total.
- */
- nir->num_uniforms = 0;
- nir_foreach_variable(var, &nir->uniforms) {
- var->data.driver_location = var->data.location;
- unsigned end = var->data.location + nir_uniform_type_size(var->type);
- nir->num_uniforms = MAX2(nir->num_uniforms, end);
- }
- nir_lower_io(nir, nir_var_uniform, nir_uniform_type_size);
-
const unsigned *program =
brw_compile_fs(compiler, blorp->driver_ctx, mem_ctx,
wm_key, &wm_prog_data, nir,
--
2.5.0.400.gff86faf
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
