Mesa (master): glsl: Fix flipped return of has_value() for array constants.

Eric Anholt anholt at kemper.freedesktop.org
Thu Dec 2 18:29:27 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Dec  2 08:52:58 2010 -0800

glsl: Fix flipped return of has_value() for array constants.

Fixes glsl-array-uniform.

---

 src/glsl/ir.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 31b90bf..b8b0fed 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -778,7 +778,7 @@ ir_constant::has_value(const ir_constant *c) const
 
    if (this->type->is_array()) {
       for (unsigned i = 0; i < this->type->length; i++) {
-	 if (this->array_elements[i]->has_value(c->array_elements[i]))
+	 if (!this->array_elements[i]->has_value(c->array_elements[i]))
 	    return false;
       }
       return true;




More information about the mesa-commit mailing list