From a1a1ff5ec09acda0c4849c9e41a37ae82a80f000 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sat, 7 Jul 2012 07:40:36 +0200 Subject: r600g: move MULTIWRITE setup into cb_misc_state for r6xx-r7xx Reviewed-by: Alex Deucher --- src/gallium/drivers/r600/r600_pipe.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gallium/drivers/r600/r600_pipe.h') diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index ef27742d872..d2ae314b980 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -84,8 +84,10 @@ struct r600_db_misc_state { struct r600_cb_misc_state { struct r600_atom atom; + unsigned cb_color_control; /* this comes from blend state */ unsigned blend_colormask; /* 8*4 bits for 8 RGBA colorbuffers */ unsigned nr_cbufs; + bool multiwrite; }; enum r600_pipe_state_id { @@ -291,7 +293,6 @@ struct r600_context { unsigned sx_alpha_test_control; unsigned cb_shader_mask; unsigned db_shader_control; - unsigned cb_color_control; unsigned pa_sc_line_stipple; unsigned pa_cl_clip_cntl; /* for saving when using blitter */ -- cgit v1.2.3