diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2009-04-03 15:15:22 +0200 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2009-04-06 11:58:08 +0200 |
| commit | 741aaaa2881e5ab60cfa55f081f7b9ca6f4de46b (patch) | |
| tree | 2687b00ae37b53dad5e5ea545134475a36a125d5 /src/mesa/drivers/dri/radeon/radeon_span.c | |
| parent | 05304d41f2d9ab7a66a8b976580c156b7b93a9d3 (diff) | |
| download | external_mesa3d-741aaaa2881e5ab60cfa55f081f7b9ca6f4de46b.zip external_mesa3d-741aaaa2881e5ab60cfa55f081f7b9ca6f4de46b.tar.gz external_mesa3d-741aaaa2881e5ab60cfa55f081f7b9ca6f4de46b.tar.bz2 | |
radeon: add support for new ttm
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_span.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_span.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c index b0c77be..e28f286 100644 --- a/src/mesa/drivers/dri/radeon/radeon_span.c +++ b/src/mesa/drivers/dri/radeon/radeon_span.c @@ -503,9 +503,10 @@ static void radeonSpanRenderStart(GLcontext * ctx) * unnecessary due to the fact that mapping our buffers, textures, etc. * should implicitly wait for any previous rendering commands that must * be waited on. */ - LOCK_HARDWARE(rmesa); - radeonWaitForIdleLocked(rmesa); - + if (!rmesa->radeonScreen->driScreen->dri2.enabled) { + LOCK_HARDWARE(rmesa); + radeonWaitForIdleLocked(rmesa); + } for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) { if (ctx->Texture.Unit[i]._ReallyEnabled) ctx->Driver.MapTexture(ctx, ctx->Texture.Unit[i]._Current); @@ -522,8 +523,9 @@ static void radeonSpanRenderFinish(GLcontext * ctx) radeonContextPtr rmesa = RADEON_CONTEXT(ctx); int i; _swrast_flush(ctx); - UNLOCK_HARDWARE(rmesa); - + if (!rmesa->radeonScreen->driScreen->dri2.enabled) { + UNLOCK_HARDWARE(rmesa); + } for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) { if (ctx->Texture.Unit[i]._ReallyEnabled) ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[i]._Current); |