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.
This commit is contained in:
@@ -272,15 +272,12 @@ map_textures(struct gl_context *ctx, const struct gl_vertex_program *vp)
|
|||||||
{
|
{
|
||||||
GLuint u;
|
GLuint u;
|
||||||
|
|
||||||
if (!ctx->Driver.MapTexture)
|
|
||||||
return;
|
|
||||||
|
|
||||||
for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
|
for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
|
||||||
if (vp->Base.TexturesUsed[u]) {
|
if (vp->Base.TexturesUsed[u]) {
|
||||||
/* Note: _Current *should* correspond to the target indicated
|
/* Note: _Current *should* correspond to the target indicated
|
||||||
* in TexturesUsed[u].
|
* 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;
|
GLuint u;
|
||||||
|
|
||||||
if (!ctx->Driver.MapTexture)
|
|
||||||
return;
|
|
||||||
|
|
||||||
for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
|
for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
|
||||||
if (vp->Base.TexturesUsed[u]) {
|
if (vp->Base.TexturesUsed[u]) {
|
||||||
/* Note: _Current *should* correspond to the target indicated
|
/* Note: _Current *should* correspond to the target indicated
|
||||||
* in TexturesUsed[u].
|
* in TexturesUsed[u].
|
||||||
*/
|
*/
|
||||||
ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[u]._Current);
|
_swrast_unmap_texture(ctx, ctx->Texture.Unit[u]._Current);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user