projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/nine: Fix CND implementation
[mesa.git]
/
src
/
glsl
/
opt_rebalance_tree.cpp
diff --git
a/src/glsl/opt_rebalance_tree.cpp
b/src/glsl/opt_rebalance_tree.cpp
index 7ef0d2db39209aa7fbede1da21ee8b316f83ae6a..095f2d7d2f079b7e7a57212de23f3b70388d5eca 100644
(file)
--- 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;
if (!expr)
return;
-
expr->
type =
+
const glsl_type *const new_
type =
glsl_type::get_instance(expr->type->base_type,
glsl_type::get_instance(expr->type->base_type,
- MAX2(expr->operands[0]->type->
components()
,
- expr->operands[1]->type->
components()
),
+ MAX2(expr->operands[0]->type->
vector_elements
,
+ expr->operands[1]->type->
vector_elements
),
1);
1);
+ assert(new_type != glsl_type::error_type);
+ expr->type = new_type;
}
void
}
void