mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-07 09:18:04 +02:00
glsl: Don't allow unnamed interface blocks to redeclare variables.
Note: some limited amount of redeclaration is actually allowed,
provided the shader is redeclaring the built-in gl_PerVertex interface
block. Support for this will be added in future patches.
Fixes piglit tests
spec/glsl-1.50/compiler/unnamed-interface-block-elem-conflicts-with-prev-{block-elem,global}.vert.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
parent
1838df97a2
commit
9bb60a155f
1 changed files with 3 additions and 0 deletions
|
|
@ -4742,6 +4742,9 @@ ast_interface_block::hir(exec_list *instructions,
|
|||
var_mode);
|
||||
var->init_interface_type(block_type);
|
||||
|
||||
if (state->symbols->get_variable(var->name) != NULL)
|
||||
_mesa_glsl_error(&loc, state, "`%s' redeclared", var->name);
|
||||
|
||||
/* Propagate the "binding" keyword into this UBO's fields;
|
||||
* the UBO declaration itself doesn't get an ir_variable unless it
|
||||
* has an instance name. This is ugly.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue