diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2009-11-18 22:09:33 +0100 |
|---|---|---|
| committer | Maciej Cencora <m.cencora@gmail.com> | 2009-11-18 22:09:33 +0100 |
| commit | cefee4e327c92daa2f01b6de650a43eddd348063 (patch) | |
| tree | d1d25c4883357b12fd0c1deecc49cddc7e46976d /src/mesa/drivers/dri/radeon/radeon_common.c | |
| parent | d4dc2e30dada1be425e95ba270920db6eb210982 (diff) | |
| parent | 7118db870091d4c9c2465e79f361ff0ed36d1f90 (diff) | |
Merge branch 'radeon-texrewrite-clean' into 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 |