Mesa (master): mesa: remove unused ctx->Driver.TextureMatrix() hook
Brian Paul
brianp at kemper.freedesktop.org
Thu Oct 15 01:08:50 UTC 2009
Module: Mesa
Branch: master
Commit: 0187e042b681663938a1a12e9ae03c6f0ab48af5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0187e042b681663938a1a12e9ae03c6f0ab48af5
Author: Brian Paul <brianp at vmware.com>
Date: Wed Oct 14 15:00:50 2009 -0600
mesa: remove unused ctx->Driver.TextureMatrix() hook
---
src/mesa/drivers/common/driverfuncs.c | 1 -
src/mesa/main/dd.h | 1 -
src/mesa/main/texstate.c | 7 -------
3 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 0f8447c..5934907 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -183,7 +183,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
driver->TexGen = NULL;
driver->TexEnv = NULL;
driver->TexParameter = NULL;
- driver->TextureMatrix = NULL;
driver->Viewport = NULL;
/* vertex arrays */
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index ce5e158..a9632ec 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -717,7 +717,6 @@ struct dd_function_table {
void (*TexParameter)(GLcontext *ctx, GLenum target,
struct gl_texture_object *texObj,
GLenum pname, const GLfloat *params);
- void (*TextureMatrix)(GLcontext *ctx, GLuint unit, const GLmatrix *mat);
/** Set the viewport */
void (*Viewport)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
/*@}*/
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 43f2687..16492bd 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -307,10 +307,6 @@ _mesa_ActiveTextureARB(GLenum texture)
/* update current stack pointer */
ctx->CurrentStack = &ctx->TextureMatrixStack[texUnit];
}
-
- if (ctx->Driver.ActiveTexture) {
- (*ctx->Driver.ActiveTexture)( ctx, (GLuint) texUnit );
- }
}
@@ -360,9 +356,6 @@ update_texture_matrices( GLcontext *ctx )
if (ctx->Texture.Unit[u]._ReallyEnabled &&
ctx->TextureMatrixStack[u].Top->type != MATRIX_IDENTITY)
ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(u);
-
- if (ctx->Driver.TextureMatrix)
- ctx->Driver.TextureMatrix( ctx, u, ctx->TextureMatrixStack[u].Top);
}
}
}
More information about the mesa-commit
mailing list