summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-01-16 13:05:55 -0700
committerBrian Paul <[email protected]>2012-01-24 14:12:36 -0700
commit4bbab2275f792553f8ed6bcebfe6acc4cb4179c2 (patch)
treec9baea0468f90203e7109c27aec62835c744eb31 /src/mesa/tnl
parentbde356a1580f52cae0aaca020a33a6437083a450 (diff)
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.
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_vb_program.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 8b060ff93e4..7687ae0b3cf 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);
}
}
}