diff options
author | Matt Turner <[email protected]> | 2016-04-12 15:26:06 -0700 |
---|---|---|
committer | Matt Turner <[email protected]> | 2016-04-13 11:00:21 -0700 |
commit | 9bac27dbf92d32cd8685868d21d0317a5a56f333 (patch) | |
tree | 638589d26ee5bef6a6d60e1093f7a610a9293bbc /src/compiler/glsl/linker.cpp | |
parent | 9586468c03ba9d0c488882eba1d870acd7adfd9e (diff) |
glsl: Rename "vertex_input_slots" -> "is_vertex_input"
vertex_input_slots would be an appropriate name for an integer, but not
a bool.
Also remove a cond ? true : false from a count_attribute_slots() call
site, noticed during the rename.
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Iago Toral Quiroga <[email protected]>
Diffstat (limited to 'src/compiler/glsl/linker.cpp')
-rw-r--r-- | src/compiler/glsl/linker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 0773d4244b4..dcc8a57b6be 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -2618,7 +2618,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog, return false; } - const unsigned slots = var->type->count_attribute_slots(target_index == MESA_SHADER_VERTEX ? true : false); + const unsigned slots = var->type->count_attribute_slots(target_index == MESA_SHADER_VERTEX); /* If the variable is not a built-in and has a location statically * assigned in the shader (presumably via a layout qualifier), make sure @@ -3575,7 +3575,7 @@ add_shader_variable(struct gl_shader_program *shProg, unsigned stage_mask, const char *name, const glsl_type *type, bool use_implicit_location, int location) { - const bool vertex_input_slots = + const bool is_vertex_input = programInterface == GL_PROGRAM_INPUT && stage_mask == MESA_SHADER_VERTEX; @@ -3600,7 +3600,7 @@ add_shader_variable(struct gl_shader_program *shProg, unsigned stage_mask, return false; field_location += - field->type->count_attribute_slots(vertex_input_slots); + field->type->count_attribute_slots(is_vertex_input); } return true; } |