OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Rename linker's is_varying_var

Browse Source 
Both the ast->IR and linker have functions with this name, but different
behavior.

Rename the linker's version to var_counts_against_varying_limit to be
closer to what it is actually used for.

Suggested by Ian a while back.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
This commit is contained in:
Chris Forbes
2014-05-09 11:28:49 +12:00
parent 9584959123
commit 417f5ea00d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/glsl/link_varyings.cpp
View File

@@ -992,7 +992,7 @@ varying_matches::match_comparator(const void *x_generic, const void *y_generic)
* varyings, but excludes variables such as gl_FrontFacing and gl_FragCoord. * varyings, but excludes variables such as gl_FrontFacing and gl_FragCoord.
*/ */
static bool static bool
is_varying_var(gl_shader_stage stage, const ir_variable *var) var_counts_against_varying_limit(gl_shader_stage stage, const ir_variable *var)
{ {
/* Only fragment shaders will take a varying variable as an input */ /* Only fragment shaders will take a varying variable as an input */
if (stage == MESA_SHADER_FRAGMENT && if (stage == MESA_SHADER_FRAGMENT &&
@@ -1462,7 +1462,7 @@ check_against_output_limit(struct gl_context *ctx,
ir_variable *const var = ((ir_instruction *) node)->as_variable(); ir_variable *const var = ((ir_instruction *) node)->as_variable();
if (var && var->data.mode == ir_var_shader_out && if (var && var->data.mode == ir_var_shader_out &&
is_varying_var(producer->Stage, var)) { var_counts_against_varying_limit(producer->Stage, var)) {
output_vectors += var->type->count_attribute_slots(); output_vectors += var->type->count_attribute_slots();
} }
} }
@@ -1501,7 +1501,7 @@ check_against_input_limit(struct gl_context *ctx,
ir_variable *const var = ((ir_instruction *) node)->as_variable(); ir_variable *const var = ((ir_instruction *) node)->as_variable();
if (var && var->data.mode == ir_var_shader_in && if (var && var->data.mode == ir_var_shader_in &&
is_varying_var(consumer->Stage, var)) { var_counts_against_varying_limit(consumer->Stage, var)) {
input_vectors += var->type->count_attribute_slots(); input_vectors += var->type->count_attribute_slots();
} }
} }