Before calling _mesa_create_context(), initialize a dd_function_table struct

by calling _mesa_init_driver_functions() and then plugging in the driver-
specific functions.
In particular, make sure ctx->Driver.NewTextureObject points to the
appropriate driver function so that _all_ texture objects are augmented
with the driver-specific data.
Put in a bunch of assertions in the texture-related driver functions that
texObj->DriverData is valid.  Remove old dead code in near future.

1 files changed, 3 insertions, 54 deletions

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.h b/src/mesa/drivers/dri/tdfx/tdfx_tex.h
index 5fc7c740bf..29872e7647 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.h
@@ -53,9 +53,6 @@
 extern void
 tdfxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj);
 
-extern void
-tdfxDDBindTexture(GLcontext * ctx, GLenum target,
-                  struct gl_texture_object *tObj);
 
 extern void
 tdfxDDDeleteTexture(GLcontext * ctx, struct gl_texture_object *tObj);
@@ -71,57 +68,6 @@ extern void
 fxDDTexUseGlobalPalette(GLcontext * ctx, GLboolean state);
 #endif
 
-extern void
-tdfxDDTexEnv(GLcontext * ctx, GLenum target, GLenum pname,
-             const GLfloat * param);
-
-extern void
-tdfxDDTexParameter(GLcontext * ctx, GLenum target,
-                   struct gl_texture_object *tObj,
-                   GLenum pname, const GLfloat * params);
-
-extern const struct gl_texture_format *
-tdfxDDChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
-                           GLenum srcFormat, GLenum srcType );
-
-extern void
-tdfxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level,
-                 GLint internalFormat, GLint width, GLint height,
-                 GLint border,
-                 GLenum format, GLenum type, const GLvoid * pixels,
-                 const struct gl_pixelstore_attrib * packing,
-                 struct gl_texture_object * texObj,
-                 struct gl_texture_image * texImage);
-
-extern void
-tdfxDDTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
-                    GLint xoffset, GLint yoffset,
-                    GLsizei width, GLsizei height,
-                    GLenum format, GLenum type,
-                    const GLvoid *pixels,
-                    const struct gl_pixelstore_attrib *packing,
-                    struct gl_texture_object *texObj,
-                    struct gl_texture_image *texImage );
-
-#if 000
-extern GLboolean
-tdfxDDCompressedTexImage2D( GLcontext *ctx, GLenum target,
-                            GLint level, GLsizei imageSize,
-                            const GLvoid *data,
-                            struct gl_texture_object *texObj,
-                            struct gl_texture_image *texImage,
-                            GLboolean *retainInternalCopy);
-
-extern GLboolean
-tdfxDDCompressedTexSubImage2D( GLcontext *ctx, GLenum target,
-                               GLint level, GLint xoffset,
-                               GLint yoffset, GLsizei width,
-                               GLint height, GLenum format,
-                               GLsizei imageSize, const GLvoid *data,
-                               struct gl_texture_object *texObj,
-                               struct gl_texture_image *texImage );
-#endif
-
 extern GLboolean
 tdfxDDTestProxyTexImage(GLcontext *ctx, GLenum target,
                         GLint level, GLint internalFormat,
@@ -162,4 +108,7 @@ tdfxDDCompressedImageSize(GLcontext *ctx,
                           GLuint depth);
 
 
+extern void
+tdfxInitTextureFuncs( struct dd_function_table *functions );
+
 #endif