summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/r600_pipe.h
diff options
context:
space:
mode:
authorTom Stellard <[email protected]>2012-07-24 14:23:12 +0000
committerTom Stellard <[email protected]>2012-07-27 17:08:09 +0000
commitd3b013049126fb44d65a0a67001b04acbe778613 (patch)
tree9826a0988535c2a04cac892862fc8580004988f1 /src/gallium/drivers/r600/r600_pipe.h
parent54973910676951050092c096046b213f6a6944b5 (diff)
r600g: Atomize compute shader state
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
-rw-r--r--src/gallium/drivers/r600/r600_pipe.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 222b87b61e3..724707e0fb8 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -100,6 +100,11 @@ struct r600_alphatest_state {
bool cb0_export_16bpc; /* from set_framebuffer_state */
};
+struct r600_cs_shader_state {
+ struct r600_atom atom;
+ struct r600_pipe_compute *shader;
+};
+
enum r600_pipe_state_id {
R600_PIPE_STATE_BLEND = 0,
R600_PIPE_STATE_BLEND_COLOR,
@@ -324,7 +329,6 @@ struct r600_context {
struct pipe_clip_state clip;
struct r600_pipe_shader_selector *ps_shader;
struct r600_pipe_shader_selector *vs_shader;
- struct r600_pipe_compute *cs_shader;
struct r600_pipe_rasterizer *rasterizer;
struct r600_pipe_state vgt;
struct r600_pipe_state spi;
@@ -364,6 +368,7 @@ struct r600_context {
struct r600_constbuf_state ps_constbuf_state;
struct r600_textures_info vs_samplers;
struct r600_textures_info ps_samplers;
+ struct r600_cs_shader_state cs_shader_state;
struct radeon_winsys_cs *cs;