diff options
| author | Marek Olšák <[email protected]> | 2010-02-12 04:01:15 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2010-02-13 15:44:43 +0100 |
| commit | 8e2f9f4009ae9974a1fd51466a1e8080bdcdbdc0 (patch) | |
| tree | 021f4d9343e9285b16e67e9370d48d9075d88254 /src/gallium | |
| parent | 75910e96dc9704e2ade842fde2647b27393ddcb7 (diff) | |
r300g: disable independent blend enables
Not supported by r300.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r300/r300_emit.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index 26bdcff61ec..324952b9776 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -404,8 +404,7 @@ void r300_emit_fb_state(struct r300_context* r300, void* state) if (r300screen->caps->is_r500) { OUT_CS_REG(R300_RB3D_CCTL, R300_RB3D_CCTL_NUM_MULTIWRITES(fb->nr_cbufs) | - R300_RB3D_CCTL_INDEPENDENT_COLORFORMAT_ENABLE_ENABLE | - R300_RB3D_CCTL_INDEPENDENT_COLOR_CHANNEL_MASK_ENABLE); + R300_RB3D_CCTL_INDEPENDENT_COLORFORMAT_ENABLE_ENABLE); } else { OUT_CS_REG(R300_RB3D_CCTL, R300_RB3D_CCTL_NUM_MULTIWRITES(fb->nr_cbufs)); diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 13cd04a80cc..7c8dd754578 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -153,11 +153,7 @@ static int r300_get_param(struct pipe_screen* pscreen, int param) return 0; } case PIPE_CAP_INDEP_BLEND_ENABLE: - if (r300screen->caps->is_r500) { - return 1; - } else { - return 0; - } + return 0; case PIPE_CAP_INDEP_BLEND_FUNC: return 0; case PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT: |