summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300/r300_emit.c
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2010-01-10 23:02:48 -0800
committerCorbin Simpson <MostAwesomeDude@gmail.com>2010-01-10 23:15:05 -0800
commit1e9ffb63401b7bdaf05c53e07b588128566b437d (patch)
tree01d5d1b3147afd6caf9fb493972f5bb46820f85a /src/gallium/drivers/r300/r300_emit.c
parent8ca491386d0fb9e675e7dfbdd05bc09af74d75d3 (diff)
r300g: Atomize scissors.
Argfl. Some of this code is so questionable.
Diffstat (limited to 'src/gallium/drivers/r300/r300_emit.c')
-rw-r--r--src/gallium/drivers/r300/r300_emit.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index 86d4000d08..0e5533c790 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -653,9 +653,9 @@ static void r300_emit_scissor_regs(struct r300_context* r300,
END_CS;
}
-void r300_emit_scissor_state(struct r300_context* r300,
- struct r300_scissor_state* scissor)
+void r300_emit_scissor_state(struct r300_context* r300, void* state)
{
+ struct r300_scissor_state* scissor = (struct r300_scissor_state*)state;
/* XXX argfl! */
if (((struct r300_rs_state*)r300->rs_state.state)->rs.scissor) {
r300_emit_scissor_regs(r300, &scissor->scissor);
@@ -1108,11 +1108,6 @@ validate:
r300->dirty_state &= ~R300_NEW_RS_BLOCK;
}
- if (r300->dirty_state & R300_NEW_SCISSOR) {
- r300_emit_scissor_state(r300, r300->scissor_state);
- r300->dirty_state &= ~R300_NEW_SCISSOR;
- }
-
/* Samplers and textures are tracked separately but emitted together. */
if (r300->dirty_state &
(R300_ANY_NEW_SAMPLERS | R300_ANY_NEW_TEXTURES)) {