fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: dont allow undefined array sizes in ES

Browse source 
This applies the rule to empty declarations.

Fixes:
dEQP-GLES3.functional.shaders.arrays.invalid.empty_declaration_without_var_name_vertex
dEQP-GLES3.functional.shaders.arrays.invalid.empty_declaration_without_var_name_fragment

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri 2016-03-08 20:35:41 +11:00
parent 353a4f844f
commit 2188c77a0e
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/glsl/ast_to_hir.cpp
View file

@ -4223,6 +4223,18 @@ ast_declarator_list::hir(exec_list *instructions,
type_name);
} else {
if (decl_type->base_type == GLSL_TYPE_ARRAY) {
/* From Section 13.22 (Array Declarations) of the GLSL ES 3.2
* spec:
*
* "... any declaration that leaves the size undefined is
* disallowed as this would add complexity and there are no
* use-cases."
*/
if (state->es_shader && decl_type->is_unsized_array()) {
_mesa_glsl_error(&loc, state, "array size must be explicitly "
"or implicitly defined");
}
/* From Section 4.12 (Empty Declarations) of the GLSL 4.5 spec:
*
* "The combinations of types and qualifiers that cause