diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2006-09-12 18:34:43 +0000 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2006-09-12 18:34:43 +0000 |
| commit | 6a65e6db3d9a64cd2b233155a05074a3eb5c1975 (patch) | |
| tree | 0d74c2b1c7fecf2a5993d192a02e9ab826713f3b /src/mesa/drivers/dri/r300/radeon_state.c | |
| parent | b1cb39d8bdb6707be2e44d38c52f44515bcbf16e (diff) | |
Removing some of r200 dependency, cleaning up code a bit,
and fixing a couple of warning. More cleanup and shuffle
to come. I have tested this change they might broke things
especialy with r300_texstate.c change (format_x doesn't
seems to be use at all by r300).
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_state.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_state.c b/src/mesa/drivers/dri/r300/radeon_state.c index c95ae8df4f..a6375ff878 100644 --- a/src/mesa/drivers/dri/r300/radeon_state.c +++ b/src/mesa/drivers/dri/r300/radeon_state.c @@ -140,10 +140,7 @@ static void radeonScissor(GLcontext* ctx, GLint x, GLint y, GLsizei w, GLsizei h if (ctx->Scissor.Enabled) { /* We don't pipeline cliprect changes */ - if (IS_R200_CLASS(radeon->radeonScreen)) - R200_FIREVERTICES((r200ContextPtr)radeon); - else - r300Flush(ctx); + r300Flush(ctx); radeonUpdateScissor(ctx); } @@ -196,10 +193,7 @@ void radeonEnable(GLcontext* ctx, GLenum cap, GLboolean state) switch(cap) { case GL_SCISSOR_TEST: /* We don't pipeline cliprect & scissor changes */ - if (IS_R200_CLASS(radeon->radeonScreen)) - R200_FIREVERTICES((r200ContextPtr)radeon); - else - r300Flush(ctx); + r300Flush(ctx); radeon->state.scissor.enabled = state; radeonUpdateScissor(ctx); |