From 4bbab2275f792553f8ed6bcebfe6acc4cb4179c2 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 16 Jan 2012 13:05:55 -0700 Subject: [PATCH] tnl: remove ctx->Driver.Map/UnmapTexture() calls ctx->Driver.MapTexture() always points to _swrast_map_texture(). We're already reaching into swrast from t_vb_program.c anyway. This will let us remove the ctx->Driver.Map/UnmapTexture() functions. --- src/mesa/tnl/t_vb_program.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c index 8b060ff..7687ae0 100644 --- a/src/mesa/tnl/t_vb_program.c +++ b/src/mesa/tnl/t_vb_program.c @@ -272,15 +272,12 @@ map_textures(struct gl_context *ctx, const struct gl_vertex_program *vp) { GLuint u; - if (!ctx->Driver.MapTexture) - return; - for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) { if (vp->Base.TexturesUsed[u]) { /* Note: _Current *should* correspond to the target indicated * in TexturesUsed[u]. */ - ctx->Driver.MapTexture(ctx, ctx->Texture.Unit[u]._Current); + _swrast_map_texture(ctx, ctx->Texture.Unit[u]._Current); } } } @@ -294,15 +291,12 @@ unmap_textures(struct gl_context *ctx, const struct gl_vertex_program *vp) { GLuint u; - if (!ctx->Driver.MapTexture) - return; - for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) { if (vp->Base.TexturesUsed[u]) { /* Note: _Current *should* correspond to the target indicated * in TexturesUsed[u]. */ - ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[u]._Current); + _swrast_unmap_texture(ctx, ctx->Texture.Unit[u]._Current); } } } -- 2.7.4