From b6326abb859550963446affe9123085fd57f9525 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 31 Mar 2010 16:25:21 -0700 Subject: [PATCH] Reject array constructor calls in GLSL 1.10 --- ast_function.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ast_function.cpp b/ast_function.cpp index f8c2b6eaa27..74ae5d8962b 100644 --- a/ast_function.cpp +++ b/ast_function.cpp @@ -190,6 +190,15 @@ ast_function_expression::hir(exec_list *instructions, return ir_call::get_error_instruction(); } + if (constructor_type->is_array()) { + if (state->language_version <= 110) { + _mesa_glsl_error(& loc, state, + "array constructors forbidden in GLSL 1.10"); + return ir_call::get_error_instruction(); + } + + return ir_call::get_error_instruction(); + } /* There are two kinds of constructor call. Constructors for built-in * language types, such as mat4 and vec2, are free form. The only -- 2.30.2