Mesa (master): glsl: Require function return type arrays be explicitly sized
Ian Romanick
idr at kemper.freedesktop.org
Wed Aug 14 00:53:48 UTC 2013
Module: Mesa
Branch: master
Commit: 1b35e33af420cd335610289aa2d8a175a7139a97
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b35e33af420cd335610289aa2d8a175a7139a97
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Aug 8 17:40:38 2013 -0700
glsl: Require function return type arrays be explicitly sized
Fixes piglit array-function-return-unsized.vert.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: "9.2" <mesa-stable at lists.freedesktop.org>
---
src/glsl/ast_to_hir.cpp | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 325cb06..49804b7 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
More information about the mesa-commit
mailing list