From: Chad Versace <chad.versace@intel.com>
Date: Tue, 9 Nov 2010 01:30:13 +0000 (-0800)
Subject: glsl: Fix ir_expression::constant_expression_value()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b62c1c4595551c4936323135224a5ea686ba972a;p=mesa.git

glsl: Fix ir_expression::constant_expression_value()

When the type of the ir_expression is error_type, return NULL.
This fixes bug 31371.
---

diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 048c020c835..ce13a06ff4f 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;