Track whether whole-arrays are assignable

In GLSL 1.10 this was not allowed, but in GLSL 1.20 and later it is.

This causes the following tests to pass:

    glslparsertest/glsl2/array-09.vert
    glslparsertest/glsl2/array-13.vert

diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index cc985814db62769397e8e182077c75dff3b3e71d..c0266e9b492f9c11228eb0651d436c1a67001a3d 100644 (file)
--- a/ast_to_hir.cpp
+++ b/ast_to_hir.cpp
@@ -1283,6 +1283,10 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
       var->interpolation = ir_var_noperspective;
    else
       var->interpolation = ir_var_smooth;
+
+   if (var->type->is_array() && (state->language_version >= 120)) {
+      var->array_lvalue = true;
+   }
 }
 
 

diff --git a/ir.cpp b/ir.cpp
index ef93c406198a85bcff77c21fd569e0b3a7f5635f..c900a285bc7b1d3abf5aaa632f1e6ec3cb3958c3 100644 (file)
--- a/ir.cpp
+++ b/ir.cpp
@@ -200,18 +200,14 @@ ir_dereference::is_lvalue()
    if (var == NULL)
       return false;
 
-   /* Arrays are not assignable in GLSL 1.10, but in GLSL 1.20 and later they
-    * are.
-    */
-   /* FINISHME: Handle GLSL 1.10 vs 1.20 differences. */
-   if (this->type->base_type == GLSL_TYPE_ARRAY)
-      return false;
-
    if (mode == ir_reference_variable) {
       ir_variable *const as_var = var->as_variable();
       if (as_var == NULL)
         return false;
 
+      if (as_var->type->is_array() && !as_var->array_lvalue)
+        return false;
+
       return !as_var->read_only;
    } else if (mode == ir_reference_array) {
       /* FINISHME: Walk up the dereference chain and figure out if

diff --git a/ir.h b/ir.h
index 3caff3624aea1cd27a1da72b96276f78aa67d475..5267d2bc7879615044e66178352adb7d4044b905 100644 (file)
--- a/ir.h
+++ b/ir.h
@@ -146,6 +146,14 @@ public:
 
    unsigned mode:3;
    unsigned interpolation:2;
+
+   /**
+    * Flag that the whole array is assignable
+    *
+    * In GLSL 1.20 and later whole arrays are assignable (and comparable for
+    * equality).  This flag enables this behavior.
+    */
+   unsigned array_lvalue:1;
 };