From f45d39f6afc436ee4c68a21382933b2b39879eef Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Tue, 25 Aug 2015 08:02:46 +0200 Subject: [PATCH] glsl: return error if unsized arrays are found in OpenGL ES MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Iglesias Gonsalvez Reviewed-by: Tapani Pälli Reviewed-by: Kristian Høgsberg --- src/glsl/ast_to_hir.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 72c6459..b67ae70 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -6252,6 +6252,22 @@ ast_interface_block::hir(exec_list *instructions, else if (state->stage == MESA_SHADER_TESS_CTRL && var_mode == ir_var_shader_out) handle_tess_ctrl_shader_output_decl(state, loc, var); + for (unsigned i = 0; i < num_variables; i++) { + /* From GLSL ES 3.10 spec, section 4.1.9 "Arrays": + * + * "If an array is declared as the last member of a shader storage + * block and the size is not specified at compile-time, it is + * sized at run-time. In all other cases, arrays are sized only + * at compile-time." + */ + if (state->es_shader && fields[i].type->is_unsized_array()) { + _mesa_glsl_error(&loc, state, "unsized array `%s' definition: " + "only last member of a shader storage block " + "can be defined as unsized array", + fields[i].name); + } + } + if (ir_variable *earlier = state->symbols->get_variable(this->instance_name)) { if (!redeclaring_per_vertex) { -- 2.7.4