Mesa (refs/tags/chadv/cros-mesa-12.1.0-r3-vanilla): glsl: make sure UBO arrays are sized in ES

[GitLab Mirror]

Module: Mesa
Branch: refs/tags/chadv/cros-mesa-12.1.0-r3-vanilla
Commit: b010fa85675b98962426fe8961466fbae2d25499
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b010fa85675b98962426fe8961466fbae2d25499

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Tue Jun 14 10:13:41 2016 +1000

glsl: make sure UBO arrays are sized in ES

This check was removed in 5b2675093e86 add it back in.

Reviewed-by: Dave Airlie <airlied at redhat.com>
Cc: "12.0" <mesa-stable at lists.freedesktop.org>
https://bugs.freedesktop.org/show_bug.cgi?id=96349

---

 src/compiler/glsl/ast_to_hir.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 1c751f642ec..ea32924b3de 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -7613,6 +7613,20 @@ ast_interface_block::hir(exec_list *instructions,
                if (is_unsized_array_last_element(var)) {
                   var->data.from_ssbo_unsized_array = true;
                }
+            } else {
+               /* 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) {
+                  _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);
+               }
             }
          }