From 7db75927ca9f15bcbb28d23f9cfbc34541a51938 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 15 Jul 2014 16:35:55 -0700 Subject: glsl: Guard against error_type in the tree rebalancer. This helped me track down the bug fixed in the previous commit. Signed-off-by: Kenneth Graunke --- src/glsl/opt_rebalance_tree.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/glsl/opt_rebalance_tree.cpp') diff --git a/src/glsl/opt_rebalance_tree.cpp b/src/glsl/opt_rebalance_tree.cpp index 7ef0d2db392..f82b16b5412 100644 --- a/src/glsl/opt_rebalance_tree.cpp +++ b/src/glsl/opt_rebalance_tree.cpp @@ -271,11 +271,13 @@ update_types(ir_instruction *ir, void *) if (!expr) return; - expr->type = + const glsl_type *const new_type = glsl_type::get_instance(expr->type->base_type, MAX2(expr->operands[0]->type->components(), expr->operands[1]->type->components()), 1); + assert(new_type != glsl_type::error_type); + expr->type = new_type; } void -- cgit v1.2.3