diff options
| author | Marek Olšák <[email protected]> | 2014-09-02 20:38:08 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-09-03 11:50:21 +0200 |
| commit | 8abdc3c4a9c81e359d5dc1694253b05dd5562c95 (patch) | |
| tree | fe9f8a3b470b69337d61d3ff1fa608b01c3b3a66 | |
| parent | 2adf7ee92e19ca978d6dac29fead59f14d033f3e (diff) | |
r600g: fix alpha-test with HyperZ enabled, fixing L4D2 tree corruption
*_update_db_shader_control depends on the alpha test state. The problem was
it was in a block which is only entered if the pixel shader is changed.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74863
Cc: [email protected]
Tested-by: Benjamin Bellec <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
| -rw-r--r-- | src/gallium/drivers/r600/r600_state_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 028d800981d..d9174a59230 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -1245,12 +1245,6 @@ static bool r600_update_derived_state(struct r600_context *rctx) } } - if (rctx->b.chip_class >= EVERGREEN) { - evergreen_update_db_shader_control(rctx); - } else { - r600_update_db_shader_control(rctx); - } - if (unlikely(!ps_dirty && rctx->ps_shader && rctx->rasterizer && ((rctx->rasterizer->sprite_coord_enable != rctx->ps_shader->current->sprite_coord_enable) || (rctx->rasterizer->flatshade != rctx->ps_shader->current->flatshade)))) { @@ -1264,6 +1258,12 @@ static bool r600_update_derived_state(struct r600_context *rctx) update_shader_atom(ctx, &rctx->pixel_shader, rctx->ps_shader->current); } + if (rctx->b.chip_class >= EVERGREEN) { + evergreen_update_db_shader_control(rctx); + } else { + r600_update_db_shader_control(rctx); + } + /* on R600 we stuff masks + txq info into one constant buffer */ /* on evergreen we only need a txq info one */ if (rctx->b.chip_class < EVERGREEN) { |