From efa9750e96cc80ff76e0082063da37be53c07a12 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 1 May 2017 16:00:47 -0700 Subject: glsl: Restrict functions to not return arrays or SOAs in GLSL 1.00. From the spec, Arrays are allowed as arguments, but not as the return type. [...] The return type can also be a structure if the structure does not contain an array. Fixes DEQP shaders.functions.invalid.return_array_in_struct_fragment. v2: Spec cite wording change Reviewed-by: Samuel Pitoiset Tested-by: Matt Turner --- src/compiler/glsl/ast_to_hir.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/compiler/glsl/ast_to_hir.cpp') diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 1114d9e4595..33490c831cb 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -5825,6 +5825,18 @@ ast_function::hir(exec_list *instructions, "sized", name); } + /* From Section 6.1 (Function Definitions) of the GLSL 1.00 spec: + * + * "Arrays are allowed as arguments, but not as the return type. [...] + * The return type can also be a structure if the structure does not + * contain an array." + */ + if (state->language_version == 100 && return_type->contains_array()) { + YYLTYPE loc = this->get_location(); + _mesa_glsl_error(& loc, state, + "function `%s' return type contains an array", name); + } + /* From section 4.1.7 of the GLSL 4.40 spec: * * "[Opaque types] can only be declared as function parameters -- cgit v1.2.3