diff options
| author | Dave Airlie <[email protected]> | 2015-11-11 09:05:50 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2015-11-11 09:05:50 +1000 |
| commit | b3e793f2db0e294c2b18e030a45c6253f20a16a6 (patch) | |
| tree | f14f50a17d6c1339be8c2d29d127d1c674ebd256 /src/gallium/drivers/r600/r600_state.c | |
| parent | c878d61124397706072e0f7f5a694a8bf644cc91 (diff) | |
Revert "r600g: Pass conservative depth parameters to hw"
This reverts commit a1fc78911e9a6439db94d6ae91d5672c76e5fb1c.
I pushed the wrong patch.
Diffstat (limited to 'src/gallium/drivers/r600/r600_state.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 09b2325a239..1be3e1b4de5 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -2533,21 +2533,6 @@ void r600_update_ps_state(struct pipe_context *ctx, struct r600_pipe_shader *sha if (rshader->uses_kill) db_shader_control |= S_02880C_KILL_ENABLE(1); - if (rctx->b.chip_class >= R700) { - switch (rshader->ps_conservative_z) { - default: /* fall through */ - case TGSI_FS_DEPTH_LAYOUT_ANY: - db_shader_control |= S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_ANY_Z); - break; - case TGSI_FS_DEPTH_LAYOUT_GREATER: - db_shader_control |= S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_GREATER_THAN_Z); - break; - case TGSI_FS_DEPTH_LAYOUT_LESS: - db_shader_control |= S_02880C_CONSERVATIVE_Z_EXPORT(V_02880C_EXPORT_LESS_THAN_Z); - break; - } - } - exports_ps = 0; for (i = 0; i < rshader->noutput; i++) { if (rshader->output[i].name == TGSI_SEMANTIC_POSITION || |