From 6a65e6db3d9a64cd2b233155a05074a3eb5c1975 Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Tue, 12 Sep 2006 18:34:43 +0000 Subject: 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). --- src/mesa/drivers/dri/r300/radeon_state.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/mesa/drivers/dri/r300/radeon_state.c') 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); -- cgit v1.2.3