summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2011-11-02 14:06:44 +0000
committerDave Airlie <[email protected]>2011-11-03 10:10:07 +0000
commitd546dcbb1b8baae54b20e4718c206c2f3e47a38a (patch)
treef259cf5a4badb9e745d3c5e6cc8319ea48b9f9b3 /src/mesa
parent97213fd7417bae8ef65cd3a30c26968a45a6df94 (diff)
radeon: fix some regressions in texturing code.
On a piglit run vs 7.11 this fixes 23 tests. Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_span.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c
index 8d0133174fb..ecc3befdbfe 100644
--- a/src/mesa/drivers/dri/radeon/radeon_span.c
+++ b/src/mesa/drivers/dri/radeon/radeon_span.c
@@ -591,10 +591,9 @@ static void radeonSpanRenderStart(struct gl_context * ctx)
radeon_firevertices(rmesa);
- for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
+ for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++)
if (ctx->Texture.Unit[i]._ReallyEnabled)
- ctx->Driver.MapTexture(ctx, ctx->Texture.Unit[i]._Current);
- }
+ radeonMapTexture(ctx, ctx->Texture.Unit[i]._Current);
radeon_map_unmap_framebuffer(ctx, ctx->DrawBuffer, GL_TRUE);
if (ctx->ReadBuffer != ctx->DrawBuffer)
@@ -607,10 +606,9 @@ static void radeonSpanRenderFinish(struct gl_context * ctx)
_swrast_flush(ctx);
- for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
+ for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++)
if (ctx->Texture.Unit[i]._ReallyEnabled)
- ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[i]._Current);
- }
+ radeonUnmapTexture(ctx, ctx->Texture.Unit[i]._Current);
radeon_map_unmap_framebuffer(ctx, ctx->DrawBuffer, GL_FALSE);
if (ctx->ReadBuffer != ctx->DrawBuffer)