Module: Mesa Branch: master Commit: d546dcbb1b8baae54b20e4718c206c2f3e47a38a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d546dcbb1b8baae54b20e4718c206c2f3e47a38a
Author: Dave Airlie <[email protected]> Date: Wed Nov 2 14:06:44 2011 +0000 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]> --- src/mesa/drivers/dri/radeon/radeon_span.c | 10 ++++------ 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 8d01331..ecc3bef 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) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
