aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/ir.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-15 15:11:10 +0200
committermarha <marha@users.sourceforge.net>2011-09-15 15:11:10 +0200
commit4095d7af9f50126361eb7b0aeba6869786f63d5c (patch)
tree949709675ee9efb10c9c65dc55615444d469e63a /mesalib/src/glsl/ir.cpp
parenta0fc33d46dfe59745f22decb93fe147292335602 (diff)
parent4420369d700d9db1563f8647e1889c6a0972ea2c (diff)
downloadvcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.tar.gz
vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.tar.bz2
vcxsrv-4095d7af9f50126361eb7b0aeba6869786f63d5c.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ir.cpp')
-rw-r--r--mesalib/src/glsl/ir.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index 41ed4f114..d6594cd9a 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1105,9 +1105,6 @@ ir_dereference::is_lvalue() const
if ((var == NULL) || var->read_only)
return false;
- if (this->type->is_array() && !var->array_lvalue)
- return false;
-
/* From page 17 (page 23 of the PDF) of the GLSL 1.20 spec:
*
* "Samplers cannot be treated as l-values; hence cannot be used
@@ -1323,7 +1320,7 @@ ir_swizzle::variable_referenced() const
ir_variable::ir_variable(const struct glsl_type *type, const char *name,
ir_variable_mode mode)
: max_array_access(0), read_only(false), centroid(false), invariant(false),
- mode(mode), interpolation(ir_var_smooth), array_lvalue(false)
+ mode(mode), interpolation(ir_var_smooth)
{
this->ir_type = ir_type_variable;
this->type = type;