[Mesa-dev] [PATCH 02/10] glsl: Clarify "mask" variable in add_interface_variables().

[Kenneth Graunke]

This is a bitfield of which stages refer to a variable.  It is not used
to mask off bits.  In fact, it's used to contribute additional bits.

Rename it and tidy a bit of the logic.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 src/compiler/glsl/linker.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 549486f..2b68f79 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -3525,7 +3525,7 @@ add_interface_variables(struct gl_shader_program *shProg,
 
    foreach_in_list(ir_instruction, node, ir) {
       ir_variable *var = node->as_variable();
-      uint8_t mask = 0;
+      uint8_t stages = 0;
 
       if (!var)
          continue;
@@ -3544,7 +3544,7 @@ add_interface_variables(struct gl_shader_program *shProg,
          /* Mark special built-in inputs referenced by the vertex stage so
           * that they are considered active by the shader queries.
           */
-         mask = (1 << (MESA_SHADER_VERTEX));
+         stages = (1 << (MESA_SHADER_VERTEX));
          /* FALLTHROUGH */
       case ir_var_shader_in:
          if (programInterface != GL_PROGRAM_INPUT)
@@ -3574,9 +3574,9 @@ add_interface_variables(struct gl_shader_program *shProg,
       if (!sha_v)
          return false;
 
-      if (!add_program_resource(shProg, programInterface, sha_v,
-                                build_stageref(shProg, sha_v->name,
-                                               sha_v->mode) | mask))
+      stages |= build_stageref(shProg, sha_v->name, sha_v->mode);
+
+      if (!add_program_resource(shProg, programInterface, sha_v, stages))
          return false;
    }
    return true;
-- 
2.7.4