Module: Mesa Branch: master Commit: b62c1c4595551c4936323135224a5ea686ba972a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b62c1c4595551c4936323135224a5ea686ba972a
Author: Chad Versace <[email protected]> Date: Mon Nov 8 17:30:13 2010 -0800 glsl: Fix ir_expression::constant_expression_value() When the type of the ir_expression is error_type, return NULL. This fixes bug 31371. --- src/glsl/ir_constant_expression.cpp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp index 048c020..ce13a06 100644 --- 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
