From: Timothy Arceri Date: Tue, 23 Jan 2018 21:48:49 +0000 (+1100) Subject: st/glsl_to_nir: remove reallocation of sampler/image location X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e77679143261bc19209b927a0fbc60eb46423016;p=mesa.git st/glsl_to_nir: remove reallocation of sampler/image location As far as I can tell this always just reassigns the same value. Also as we don't curretly store UniformHash in the shader cache removing this will help with adding a shader cache to gallium nir drivers. Reviewed-by: Rob Clark --- diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index bd6d588a989..4cf150ea1ef 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -242,18 +242,10 @@ st_nir_assign_uniform_locations(struct gl_program *prog, continue; if (uniform->type->is_sampler() || uniform->type->is_image()) { - unsigned val = 0; - bool found = shader_program->UniformHash->get(val, uniform->name); if (uniform->type->is_sampler()) loc = shaderidx++; else loc = imageidx++; - assert(found); - (void) found; /* silence unused var warning */ - /* this ensure that nir_lower_samplers looks at the correct - * shader_program->UniformStorage[location]: - */ - uniform->data.location = val; } else if (strncmp(uniform->name, "gl_", 3) == 0) { const gl_state_index *const stateTokens = (gl_state_index *)uniform->state_slots[0].tokens; /* This state reference has already been setup by ir_to_mesa, but we'll