From ad6d1d70ad55e317765d2212353d4a3387d5cbeb Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 16 Dec 2016 04:54:59 -0800 Subject: [PATCH] glsl: Drop bogus is_vertex_input from add_shader_variable(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit stage_mask is a bitmask of shader stages, so the proper comparison would be (1 << MESA_SHADER_VERTEX), not MESA_SHADER_VERTEX itself. But we only care for structure types, and VS inputs cannot be structs. So we can just drop this entirely. Signed-off-by: Kenneth Graunke Reviewed-by: Alejandro Piñeiro Reviewed-by: Anuj Phogat --- src/compiler/glsl/linker.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 366025748d0..50660141c3e 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -3735,10 +3735,6 @@ add_shader_variable(const struct gl_context *ctx, bool use_implicit_location, int location, const glsl_type *outermost_struct_type = NULL) { - const bool is_vertex_input = - programInterface == GL_PROGRAM_INPUT && - stage_mask == MESA_SHADER_VERTEX; - switch (type->base_type) { case GLSL_TYPE_STRUCT: { /* The ARB_program_interface_query spec says: @@ -3764,8 +3760,7 @@ add_shader_variable(const struct gl_context *ctx, outermost_struct_type)) return false; - field_location += - field->type->count_attribute_slots(is_vertex_input); + field_location += field->type->count_attribute_slots(false); } return true; } -- 2.11.0