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

glsl: Fix broken LRP algebraic optimization.

Browse Source 
opt_algebraic was translating lrp(x, 0, a) into add(x, -mul(x, a)).

Unfortunately, this references "x" twice, which is invalid in the IR,
leading to assertion failures in the validator.

Normally, cloning IR solves this.  However, "x" could actually be an
arbitrary expression tree, so copying it could result in huge piles
of wasted computation.  This is why we avoid reusing subexpressions.

Instead, transform it into mul(x, add(1.0, -a)), which is equivalent
but doesn't need two references to "x".

Fixes a regression since d5fa8a9562, which isn't in any stable
branches.  Fixes 18 shaders in shader-db (bastion and yofrankie).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Kenneth Graunke
2014-02-28 23:15:49 -08:00
parent ecb71cfa66
commit 3f37dd913f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/glsl/opt_algebraic.cpp
View File

@@ -571,7 +571,9 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
} else if (is_vec_zero(op_const[0])) {
return mul(ir->operands[1], ir->operands[2]);
} else if (is_vec_zero(op_const[1])) {
return add(ir->operands[0], neg(mul(ir->operands[0], ir->operands[2])));
unsigned op2_components = ir->operands[2]->type->vector_elements;
ir_constant *one = new(mem_ctx) ir_constant(1.0f, op2_components);
return mul(ir->operands[0], add(one, neg(ir->operands[2])));
}
break;