glsl: Disallow embedded structure definitions
Continue to allow them in GLSL 1.10 because the spec allows it. Generate an error in all other versions because the specs specifically disallow it. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "9.2" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
parent
5fb1dd51f3
commit
d9bb8b7b56
|
@ -4455,6 +4455,34 @@ ast_struct_specifier::hir(exec_list *instructions,
|
|||
struct _mesa_glsl_parse_state *state)
|
||||
{
|
||||
YYLTYPE loc = this->get_location();
|
||||
|
||||
/* Section 4.1.8 (Structures) of the GLSL 1.10 spec says:
|
||||
*
|
||||
* "Anonymous structures are not supported; so embedded structures must
|
||||
* have a declarator. A name given to an embedded struct is scoped at
|
||||
* the same level as the struct it is embedded in."
|
||||
*
|
||||
* The same section of the GLSL 1.20 spec says:
|
||||
*
|
||||
* "Anonymous structures are not supported. Embedded structures are not
|
||||
* supported.
|
||||
*
|
||||
* struct S { float f; };
|
||||
* struct T {
|
||||
* S; // Error: anonymous structures disallowed
|
||||
* struct { ... }; // Error: embedded structures disallowed
|
||||
* S s; // Okay: nested structures with name are allowed
|
||||
* };"
|
||||
*
|
||||
* The GLSL ES 1.00 and 3.00 specs have similar langauge and examples. So,
|
||||
* we allow embedded structures in 1.10 only.
|
||||
*/
|
||||
if (state->language_version != 110 && state->struct_specifier_depth != 0)
|
||||
_mesa_glsl_error(&loc, state,
|
||||
"embedded structure declartions are not allowed");
|
||||
|
||||
state->struct_specifier_depth++;
|
||||
|
||||
glsl_struct_field *fields;
|
||||
unsigned decl_count =
|
||||
ast_process_structure_or_interface_block(instructions,
|
||||
|
@ -4481,6 +4509,8 @@ ast_struct_specifier::hir(exec_list *instructions,
|
|||
}
|
||||
}
|
||||
|
||||
state->struct_specifier_depth--;
|
||||
|
||||
/* Structure type definitions do not have r-values.
|
||||
*/
|
||||
return NULL;
|
||||
|
|
|
@ -71,6 +71,7 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
|
|||
this->loop_nesting_ast = NULL;
|
||||
this->switch_state.switch_nesting_ast = NULL;
|
||||
|
||||
this->struct_specifier_depth = 0;
|
||||
this->num_builtins_to_link = 0;
|
||||
|
||||
/* Set default language version and extensions */
|
||||
|
|
|
@ -158,6 +158,13 @@ struct _mesa_glsl_parse_state {
|
|||
unsigned language_version;
|
||||
enum _mesa_glsl_parser_targets target;
|
||||
|
||||
/**
|
||||
* Number of nested struct_specifier levels
|
||||
*
|
||||
* Outside a struct_specifer, this is zero.
|
||||
*/
|
||||
unsigned struct_specifier_depth;
|
||||
|
||||
/**
|
||||
* Default uniform layout qualifiers tracked during parsing.
|
||||
* Currently affects uniform blocks and uniform buffer variables in
|
||||
|
|
Loading…
Reference in New Issue