From 9d699cd845f3544fa6e149fa4ffb1d131d32b482 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 15 Jul 2012 03:38:42 +0200 Subject: r600g: fix lockups with and enable dual source blending on evergreen GL_ARB_blend_func_extended is now enabled on all chipsets. --- src/gallium/drivers/r600/evergreen_state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gallium/drivers/r600/evergreen_state.c') diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 8f037e26129..5486a96ed92 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1652,7 +1652,9 @@ static void evergreen_set_framebuffer_state(struct pipe_context *ctx, for (i = 0; i < state->nr_cbufs; i++) { evergreen_cb(rctx, rstate, state, i); } - + /* CB_COLOR1_INFO is already initialized for possible dual-src blending */ + if (i == 1) + i++; for (; i < 8 ; i++) { r600_pipe_state_add_reg(rstate, R_028C70_CB_COLOR0_INFO + i * 0x3C, 0); } -- cgit v1.2.3