diff options
author | Alex Deucher <[email protected]> | 2011-11-04 18:32:42 -0400 |
---|---|---|
committer | Alex Deucher <[email protected]> | 2011-11-04 18:32:42 -0400 |
commit | 9212637f34c6600daaf162f95ca49e3c42abbc40 (patch) | |
tree | 68ea26cfe7e13ef19879733a3e2f2abde2361e43 /src/gallium/drivers/r600/r600_pipe.h | |
parent | 1ca48b3161449945b769b27c33f88f397f98084a (diff) |
Revert "r600g: move SPI setup to PS setup"
This reverts commit 9804cf3118ae7249098af2a9c78b36f4fb576ee4.
This breaks r6xx.
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
-rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 92cb34dacad..330e3202bab 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -68,6 +68,7 @@ enum r600_pipe_state_id { R600_PIPE_STATE_RESOURCE, R600_PIPE_STATE_POLYGON_OFFSET, R600_PIPE_STATE_FETCH_SHADER, + R600_PIPE_STATE_SPI, R600_PIPE_NSTATES }; @@ -132,7 +133,6 @@ struct r600_pipe_shader { struct r600_resource *bo_fetch; struct r600_vertex_element vertex_elements; struct tgsi_token *tokens; - unsigned sprite_coord_enable; }; struct r600_pipe_sampler_state { @@ -215,7 +215,9 @@ struct r600_pipe_context { /* shader information */ boolean clamp_vertex_color; boolean clamp_fragment_color; + boolean spi_dirty; unsigned sprite_coord_enable; + boolean flatshade; boolean export_16bpc; unsigned alpha_ref; boolean alpha_ref_dirty; |