OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ir_to_mesa: Fix the assertion on LHS array derefs to DWIM.

Browse Source 
This allows array derefs of matrices now, which makes idr's GLSL demo
happy.
This commit is contained in:
Eric Anholt
2010-07-07 17:59:50 -07:00
parent ffd24b0a68
commit ea2a03f0a5
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mesa/shader/ir_to_mesa.cpp
View File

@@ -1247,21 +1247,24 @@ static struct ir_to_mesa_dst_reg
get_assignment_lhs(ir_instruction *ir, ir_to_mesa_visitor *v) get_assignment_lhs(ir_instruction *ir, ir_to_mesa_visitor *v)
{ {
struct ir_to_mesa_dst_reg dst_reg; struct ir_to_mesa_dst_reg dst_reg;
ir_dereference *deref;
ir_swizzle *swiz; ir_swizzle *swiz;
ir_dereference_array *deref_array = ir->as_dereference_array();
/* This should have been handled by ir_vec_index_to_cond_assign */
if (deref_array) {
assert(!deref_array->array->type->is_vector());
/* We don't handle relative addressing on the LHS yet. */
assert(deref_array->array_index->constant_expression_value() != NULL);
}
/* Use the rvalue deref handler for the most part. We'll ignore /* Use the rvalue deref handler for the most part. We'll ignore
* swizzles in it and write swizzles using writemask, though. * swizzles in it and write swizzles using writemask, though.
*/ */
ir->accept(v); ir->accept(v);
dst_reg = ir_to_mesa_dst_reg_from_src(v->result); dst_reg = ir_to_mesa_dst_reg_from_src(v->result);
if ((deref = ir->as_dereference())) { if ((swiz = ir->as_swizzle())) {
ir_dereference_array *deref_array = ir->as_dereference_array();
assert(!deref_array || deref_array->array->type->is_array());
ir->accept(v);
} else if ((swiz = ir->as_swizzle())) {
dst_reg.writemask = 0; dst_reg.writemask = 0;
if (swiz->mask.num_components >= 1) if (swiz->mask.num_components >= 1)
dst_reg.writemask |= (1 << swiz->mask.x); dst_reg.writemask |= (1 << swiz->mask.x);