Mesa (master): glsl: enforce restriction on AoA interface blocks in GLSL ES 3.10

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 0d2068a92d74f421960947e589cf56a2b125035f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d2068a92d74f421960947e589cf56a2b125035f

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Wed Jun 10 19:40:07 2015 +1000

glsl: enforce restriction on AoA interface blocks in GLSL ES 3.10

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>

---

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

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 1c2c7b5..a7811af 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -5847,6 +5847,17 @@ ast_interface_block::hir(exec_list *instructions,
          const glsl_type *block_array_type =
             process_array_type(&loc, block_type, this->array_specifier, state);
 
+          /* From section 4.3.9 (Interface Blocks) of the GLSL ES 3.10 spec:
+          *
+          *     * Arrays of arrays of blocks are not allowed
+          */
+         if (state->es_shader && block_array_type->is_array() &&
+             block_array_type->fields.array->is_array()) {
+            _mesa_glsl_error(&loc, state,
+                             "arrays of arrays interface blocks are "
+                             "not allowed");
+         }
+
          var = new(state) ir_variable(block_array_type,
                                       this->instance_name,
                                       var_mode);