diff options
author | Dave Airlie <airlied@itt42.(none)> | 2009-11-20 11:48:10 +1000 |
---|---|---|
committer | Dave Airlie <airlied@itt42.(none)> | 2009-11-20 11:48:10 +1000 |
commit | 3f2c77659ca552c43f544228f3a5a5fe6365513a (patch) | |
tree | f98f22ac8a1dbcaa9c457d8f64731c6d4a374cdb /src/mesa/drivers/dri/radeon/radeon_common.c | |
parent | b09e74901a4f92299fe3f52f57d27fd5ca5bdd2d (diff) | |
parent | f8ea5318200c1ed839fc387b16a57c8d9969974b (diff) |
Merge remote branch 'origin/mesa_7_7_branch'
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_common.c')
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c index 097ab7cf61..3b4366aa61 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common.c +++ b/src/mesa/drivers/dri/radeon/radeon_common.c @@ -257,7 +257,9 @@ void radeonScissor(GLcontext* ctx, GLint x, GLint y, GLsizei w, GLsizei h) radeonContextPtr radeon = RADEON_CONTEXT(ctx); if (ctx->Scissor.Enabled) { /* We don't pipeline cliprect changes */ - radeon_firevertices(radeon); + if (!radeon->radeonScreen->kernel_mm) { + radeon_firevertices(radeon); + } radeonUpdateScissor(ctx); } } @@ -1123,8 +1125,6 @@ void radeonFlush(GLcontext *ctx) if (radeon->dma.flush) radeon->dma.flush( ctx ); - radeonEmitState(radeon); - if (radeon->cmdbuf.cs->cdw) rcommonFlushCmdBuf(radeon, __FUNCTION__); @@ -1147,9 +1147,6 @@ void radeonFlush(GLcontext *ctx) } } } - - make_empty_list(&radeon->query.not_flushed_head); - } /* Make sure all commands have been sent to the hardware and have |