diff options
| author | Ian Romanick <[email protected]> | 2016-05-17 13:30:46 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2016-05-18 10:53:34 -0700 |
| commit | 79bbff9defd98167bf14336a44985088e2fd3f37 (patch) | |
| tree | e6bbb9d513054ebff6f5c0356dd1c9aa9f7bb573 | |
| parent | 2ef4b5bc932bac100570d377551959c5655e37a3 (diff) | |
glsl/linker: Don't include interface name for built-in blocks
Commit 11096ec introduced a regression in some piglit tests (e.g.,
arb_program_interface_query-resource-query). I did not notice this
regression because other (unrelated) problems caused failed assertions
in those same tests on my system... so they crashed before getting to
the new failure.
v2: Use is_gl_identifier. Suggested by Tim.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Cc: [email protected]
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 7f54433b307..6246944b0b4 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -3664,7 +3664,8 @@ 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 + 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, name) : name; |