summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_context.h
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2010-01-10 23:02:48 -0800
committerCorbin Simpson <[email protected]>2010-01-10 23:15:05 -0800
commit1e9ffb63401b7bdaf05c53e07b588128566b437d (patch)
tree01d5d1b3147afd6caf9fb493972f5bb46820f85a /src/gallium/drivers/r300/r300_context.h
parent8ca491386d0fb9e675e7dfbdd05bc09af74d75d3 (diff)
r300g: Atomize scissors.
Argfl. Some of this code is so questionable.
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.h')
-rw-r--r--src/gallium/drivers/r300/r300_context.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 05ea7ad0f90..70a04d6f445 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -145,7 +145,6 @@ struct r300_ztop_state {
#define R300_NEW_RS_BLOCK 0x00000100
#define R300_NEW_SAMPLER 0x00000200
#define R300_ANY_NEW_SAMPLERS 0x0001fe00
-#define R300_NEW_SCISSOR 0x00020000
#define R300_NEW_TEXTURE 0x00040000
#define R300_ANY_NEW_TEXTURES 0x03fc0000
#define R300_NEW_VERTEX_FORMAT 0x04000000
@@ -295,7 +294,7 @@ struct r300_context {
struct r300_sampler_state* sampler_states[8];
int sampler_count;
/* Scissor state. */
- struct r300_scissor_state* scissor_state;
+ struct r300_atom scissor_state;
/* Texture states. */
struct r300_texture* textures[8];
int texture_count;