Mesa (7.9): glsl: Fix flipped return of has_value() for array constants.
Ian Romanick
idr at kemper.freedesktop.org
Fri Dec 17 22:54:20 UTC 2010
Module: Mesa
Branch: 7.9
Commit: d1921796056ee770bc18e37e6a978eaf46381b93
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1921796056ee770bc18e37e6a978eaf46381b93
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.
(cherry picked from commit b381eff1411dea5b9e0c9fbc8641a8760052b2eb)
---
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 ad57079..7064fed 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -735,7 +735,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