diff options
| author | Marek Olšák <[email protected]> | 2013-07-30 22:29:00 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-07-30 22:36:20 +0200 |
| commit | 4dfe1a0df56d084b6a29fe423afe0535abec29e9 (patch) | |
| tree | 98813c2ffa5172320e3bcee296407c000e1259b4 | |
| parent | 122d8d2f5a28030f2397d61d49f3873c8db6a987 (diff) | |
Revert "r300g: Give CLIP_DISABLE another try"
This reverts commit e866bd1adea2c3b4971ad68e69c644752f2ab7b6.
https://bugs.freedesktop.org/show_bug.cgi?id=57875
Cc: [email protected]
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 8d7ffa94f35..7ead292af38 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -104,7 +104,6 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS: case PIPE_CAP_USER_INDEX_BUFFERS: case PIPE_CAP_USER_CONSTANT_BUFFERS: - case PIPE_CAP_DEPTH_CLIP_DISABLE: /* XXX implemented, but breaks Regnum Online */ case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER: return 1; @@ -138,6 +137,7 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: case PIPE_CAP_INDEP_BLEND_ENABLE: case PIPE_CAP_INDEP_BLEND_FUNC: + case PIPE_CAP_DEPTH_CLIP_DISABLE: case PIPE_CAP_SHADER_STENCIL_EXPORT: case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: case PIPE_CAP_TGSI_INSTANCEID: diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 6cfc192900a..e69a605097d 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -1333,8 +1333,7 @@ static void* r300_create_rs_state(struct pipe_context* pipe, if (r300_screen(pipe->screen)->caps.has_tcl) { vap_clip_cntl = (state->clip_plane_enable & 63) | - R300_PS_UCP_MODE_CLIP_AS_TRIFAN | - (state->depth_clip ? 0 : R300_CLIP_DISABLE); + R300_PS_UCP_MODE_CLIP_AS_TRIFAN; } else { vap_clip_cntl = R300_CLIP_DISABLE; } |