From: Ian Romanick <ian.d.roman...@intel.com>
Issue #16 of the GL_ARB_program_interface_query makes it pretty clear
array shader inputs of gl_PerVertex blocks should be reported as
gl_PerVertex.gl_Foo. Piglit tests were recently changed to expect
this behavior, and this change makes those tests pass again.
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
Cc: "12.0" <mesa-sta...@lists.freedesktop.org>
---
src/compiler/glsl/linker.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index e712ee3..010dbd7 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -3769,9 +3769,9 @@ add_shader_variable(struct gl_shader_program *shProg,
unsigned stage_mask,
* the name of the interface block (not the instance name) and
* "Member" is the name of the variable."
*/
- const char *prefixed_name = (var->data.from_named_ifc_block &&
- !is_gl_identifier(var->name))
- ? ralloc_asprintf(shProg, "%s.%s", var->get_interface_type()->name,
+ const char *prefixed_name = var->data.from_named_ifc_block
+ ? ralloc_asprintf(shProg, "%s.%s",
+ var->get_interface_type()->without_array()->name,
name)
: name;
--
2.5.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
