Mesa (master): glsl: do not try to reserve explicit locations for buffer variables

[Tapani Pälli]

Module: Mesa
Branch: master
Commit: 1f48ea1193e3659c3f94b5de31d9200c1d500e72
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f48ea1193e3659c3f94b5de31d9200c1d500e72

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Oct 20 10:24:50 2015 +0300

glsl: do not try to reserve explicit locations for buffer variables

Explicit locations are only used with uniform variables.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Marta Lofstedt <marta.lofstedt at intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>

---

 src/glsl/linker.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 247052b..07ea0e0 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -3114,8 +3114,8 @@ check_explicit_uniform_locations(struct gl_context *ctx,
 
       foreach_in_list(ir_instruction, node, sh->ir) {
          ir_variable *var = node->as_variable();
-         if (var && (var->data.mode == ir_var_uniform || var->data.mode == ir_var_shader_storage) &&
-             var->data.explicit_location) {
+         if (var && (var->data.mode == ir_var_uniform &&
+                     var->data.explicit_location)) {
             bool ret;
             if (var->type->is_subroutine())
                ret = reserve_subroutine_explicit_locations(prog, sh, var);