projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d7855ee
)
glsl: Fix ir_expression::constant_expression_value()
author
Chad Versace
<chad.versace@intel.com>
Tue, 9 Nov 2010 01:30:13 +0000
(17:30 -0800)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Tue, 9 Nov 2010 08:50:54 +0000
(
00:50
-0800)
When the type of the ir_expression is error_type, return NULL.
This fixes bug 31371.
src/glsl/ir_constant_expression.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/ir_constant_expression.cpp
b/src/glsl/ir_constant_expression.cpp
index 048c020c835347e275dd70d77fc4357abb0d56b5..ce13a06ff4f38a66cc0acf1853a1c6ca2f093dba 100644
(file)
--- a/
src/glsl/ir_constant_expression.cpp
+++ b/
src/glsl/ir_constant_expression.cpp
@@
-54,6
+54,9
@@
dot(ir_constant *op0, ir_constant *op1)
ir_constant *
ir_expression::constant_expression_value()
{
+ if (this->type->is_error())
+ return NULL;
+
ir_constant *op[2] = { NULL, NULL };
ir_constant_data data;