From: Dave Airlie <airlied@redhat.com>
Date: Wed, 2 Nov 2011 14:06:44 +0000 (+0000)
Subject: radeon: fix some regressions in texturing code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d546dcbb1b8baae54b20e4718c206c2f3e47a38a;p=mesa.git

radeon: fix some regressions in texturing code.

On a piglit run vs 7.11 this fixes 23 tests.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

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)