From df4a1348b1f869338d4742b213dbde9d64de4c7a Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 12 Feb 2009 21:44:34 +1000 Subject: [PATCH] r100/r200: fix front rendering issue. --- src/mesa/drivers/dri/r200/r200_state.c | 1 + src/mesa/drivers/dri/r300/r300_state.c | 3 --- src/mesa/drivers/dri/radeon/common_misc.c | 1 - src/mesa/drivers/dri/radeon/radeon_state.c | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 5c41018cdbd..84b0d90c69f 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1783,6 +1783,7 @@ static void r200DrawBuffer( GLcontext *ctx, GLenum mode ) } radeonSetCliprects( &rmesa->radeon ); + radeonUpdatePageFlipping(&rmesa->radeon); /* We'll set the drawing engine's offset/pitch parameters later * when we update other state. diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 1e7d9af11dc..4258a610000 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -2692,8 +2692,6 @@ void r300InitState(r300ContextPtr r300) GLcontext *ctx = r300->radeon.glCtx; GLuint depth_fmt; - radeonInitState(&r300->radeon); - switch (ctx->Visual.depthBits) { case 16: r300->radeon.state.depth.scale = 1.0 / (GLfloat) 0xffff; @@ -2769,7 +2767,6 @@ static void r300ReadBuffer( GLcontext *ctx, GLenum mode ) */ void r300InitStateFuncs(struct dd_function_table *functions) { - radeonInitStateFuncs(functions); functions->UpdateState = r300InvalidateState; functions->AlphaFunc = r300AlphaFunc; diff --git a/src/mesa/drivers/dri/radeon/common_misc.c b/src/mesa/drivers/dri/radeon/common_misc.c index 12536b16723..f0035e54cfd 100644 --- a/src/mesa/drivers/dri/radeon/common_misc.c +++ b/src/mesa/drivers/dri/radeon/common_misc.c @@ -2595,7 +2595,6 @@ again_alloc: bos[0].write_domain =0 ; bos[0].new_accounted = 0; -again: ret = radeon_cs_space_check(rmesa->cmdbuf.cs, bos, 1); if (ret == RADEON_CS_SPACE_OP_TO_BIG) { fprintf(stderr,"Got OPEARTION TO BIG ILLEGAL - this cannot happen"); diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index a9ec1d51c7e..7f90bc8090b 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -1564,7 +1564,7 @@ static void radeonDrawBuffer( GLcontext *ctx, GLenum mode ) } radeonSetCliprects( &rmesa->radeon ); - + radeonUpdatePageFlipping(&rmesa->radeon); /* We'll set the drawing engine's offset/pitch parameters later * when we update other state. */ -- 2.30.2