OSDN Git Service

glsl: Fix broken LRP algebraic optimization.
authorKenneth Graunke <kenneth@whitecape.org>
Sat, 1 Mar 2014 07:15:49 +0000 (23:15 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Sun, 2 Mar 2014 21:35:03 +0000 (13:35 -0800)
commit3f37dd913f3461fb197e878739a269e639852667
tree20dd1bc68dbf37d3f45666cbff893d6e1e292156
parentecb71cfa66f4257661579a0afa5f9c56c7dbfce2
glsl: Fix broken LRP algebraic optimization.

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 d5fa8a95621169, 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>
src/glsl/opt_algebraic.cpp