diff options
author | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-25 08:32:49 +0100 |
commit | 0c1cee47049afdcf74d87a23f4f4fd57867f6798 (patch) | |
tree | 14c117114d1b996e5b04e6546b1580ea53bc26f2 /mesalib/src/mesa/tnl | |
parent | 5be921907008288d6465962063bc10fd7a5b1906 (diff) | |
parent | e6432710d8a586386b3c7025e845cf4f80830da3 (diff) | |
download | vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.gz vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.tar.bz2 vcxsrv-0c1cee47049afdcf74d87a23f4f4fd57867f6798.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/tnl')
-rw-r--r-- | mesalib/src/mesa/tnl/t_vb_program.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/mesalib/src/mesa/tnl/t_vb_program.c b/mesalib/src/mesa/tnl/t_vb_program.c index 8b060ff93..7687ae0b3 100644 --- a/mesalib/src/mesa/tnl/t_vb_program.c +++ b/mesalib/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); } } } |