From: Tapani Pälli <tapani.palli@intel.com>
Date: Mon, 29 Jun 2015 11:19:00 +0000 (+0300)
Subject: glsl: build stageref mask using IR, not symbol table
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ccaf37f4496eb836866c9daacf21f1f5ac8c6d66;p=mesa.git

glsl: build stageref mask using IR, not symbol table

Instead of using symbol table, build mask by inspecting IR. This
change is required by further patches to move resource list creation
to happen later when symbol table does not exist anymore.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 74c2f2d4c92..d9527d4ba2b 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2624,9 +2624,17 @@ build_stageref(struct gl_shader_program *shProg, const char *name)
       struct gl_shader *sh = shProg->_LinkedShaders[i];
       if (!sh)
          continue;
-      ir_variable *var = sh->symbols->get_variable(name);
-      if (var)
-         stages |= (1 << i);
+
+      /* Shader symbol table may contain variables that have
+       * been optimized away. Search IR for the variable instead.
+       */
+      foreach_in_list(ir_instruction, node, sh->ir) {
+         ir_variable *var = node->as_variable();
+         if (var && strcmp(var->name, name) == 0) {
+            stages |= (1 << i);
+            break;
+         }
+      }
    }
    return stages;
 }