fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Clarify "mask" variable in add_interface_variables().

Browse source 
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@whitecape.org>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
This commit is contained in:
Kenneth Graunke 2016-03-29 11:37:48 -07:00
parent 356c99b4e7
commit 998ef1ad71
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/glsl/linker.cpp
View file

@ -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 || var->data.how_declared == ir_var_hidden)
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;