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 <robdclark@gmail.com>

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index bd6d588a989a0f37f1775db44a7b99c1ea1a620c..4cf150ea1ef879d215dba4d7aa54f48010bfed5f 100644 (file)
--- 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