OSDN Git Service

glsl: fix optimization of discard nested multiple levels
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Tue, 26 Jul 2016 08:04:57 +0000 (10:04 +0200)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 28 Jul 2016 16:05:28 +0000 (17:05 +0100)
commit178b889823d1df50bd7000e16dcf814febc31424
tree48f48abfbc6bf93d154de85350c87516c14013ec
parent7208d82dfb2a1709c7a5487f21778aa17685d129
glsl: fix optimization of discard nested multiple levels

The order of optimizations can lead to the conditional discard optimization
being applied twice to the same discard statement. In this case, we must
ensure that both conditions are applied.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96762
Cc: mesa-stable@lists.freedesktop.org
Tested-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 21556d86fc74d91ab58a7496a876ad33e0f950df)
[Emil Velikov: s/get_head_raw()/head/]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Conflicts:
src/compiler/glsl/opt_conditional_discard.cpp
src/compiler/glsl/opt_conditional_discard.cpp