Allow array dereferences to be considered as lvalues.

Fixes glsl-vs-arrays.vert and glsl-vs-mov-after-deref.vert.
Regresses parser3.frag which was failing for the wrong reason.

diff --git a/ir.cpp b/ir.cpp
index 35fecf75608aef33e0aa27ffbab7cdc4ece11eac..d9faac03d460adb3e676b08f2c52e177f6c341a4 100644 (file)
--- a/ir.cpp
+++ b/ir.cpp
@@ -190,6 +190,30 @@ ir_dereference::ir_dereference(ir_instruction *var,
    this->selector.array_index = array_index;
 }
 
+bool
+ir_dereference::is_lvalue()
+{
+   if (var == NULL)
+      return false;
+
+   if (this->type->base_type == GLSL_TYPE_ARRAY ||
+       this->type->base_type == GLSL_TYPE_STRUCT)
+      return false;
+
+   if (mode == ir_reference_variable) {
+      ir_variable *const as_var = var->as_variable();
+      if (as_var == NULL)
+        return false;
+
+      return !as_var->read_only;
+   } else if (mode == ir_reference_array) {
+      /* FINISHME: Walk up the dereference chain and figure out if
+       * FINISHME: the variable is read-only.
+       */
+   }
+
+   return true;
+}
 
 ir_swizzle::ir_swizzle(ir_rvalue *val, unsigned x, unsigned y, unsigned z,
                       unsigned w, unsigned count)

diff --git a/ir.h b/ir.h
index 381af357b81dcbde287b0c4f424483d6b1112c21..64ed8818431539d728aa51c3d78a83a372c76e2e 100644 (file)
--- a/ir.h
+++ b/ir.h
@@ -540,17 +540,7 @@ public:
       v->visit(this);
    }
 
-   bool is_lvalue()
-   {
-      if (var == NULL)
-        return false;
-
-      ir_variable *const as_var = var->as_variable();
-      if (as_var == NULL)
-        return false;
-
-      return !as_var->read_only;
-   }
+   bool is_lvalue();
 
    enum {
       ir_reference_variable,