From 1b35e33af420cd335610289aa2d8a175a7139a97 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 8 Aug 2013 17:40:38 -0700 Subject: [PATCH] glsl: Require function return type arrays be explicitly sized Fixes piglit array-function-return-unsized.vert. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke Cc: "9.2" --- src/glsl/ast_to_hir.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 325cb064153..49804b751e8 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -3477,6 +3477,18 @@ ast_function::hir(exec_list *instructions, "function `%s' return type has qualifiers", name); } + /* Section 6.1 (Function Definitions) of the GLSL 1.20 spec says: + * + * "Arrays are allowed as arguments and as the return type. In both + * cases, the array must be explicitly sized." + */ + if (return_type->is_array() && return_type->length == 0) { + YYLTYPE loc = this->get_location(); + _mesa_glsl_error(& loc, state, + "function `%s' return type array must be explicitly " + "sized", name); + } + /* From page 17 (page 23 of the PDF) of the GLSL 1.20 spec: * * "[Sampler types] can only be declared as function parameters -- 2.30.2