added target parameter to Driver.TexEnv()

diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index 477425c720882464d31dba605f575a47d3b37da7..29c4ab0518e29a975d710e8d52a3bc92a0c33d80 100644 (file)
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -161,7 +161,7 @@ void fxDDTexBind(GLcontext *ctx, GLenum target, struct gl_texture_object *tObj)
   ctx->Driver.RenderStart = fxSetupFXUnits;
 }
 
-void fxDDTexEnv(GLcontext *ctx, GLenum pname, const GLfloat *param)
+void fxDDTexEnv(GLcontext *ctx, GLenum target, GLenum pname, const GLfloat *param)
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
 

diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index 8e84e1bf8757bd4c1aea31e5af04bc67a772f19c..2e8321547edb5d8090a884e7d1d07486ee1d9594 100644 (file)
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -567,7 +567,7 @@ extern void fxUpdateDDSpanPointers(GLcontext *);
 extern void fxSetupDDSpanPointers(GLcontext *);
 
 extern void fxPrintTextureData(tfxTexInfo *ti);
-extern void fxDDTexEnv(GLcontext *, GLenum, const GLfloat *);
+extern void fxDDTexEnv(GLcontext *, GLenum, GLenum, const GLfloat *);
 extern void fxDDTexImg(GLcontext *, GLenum, struct gl_texture_object *,
                       GLint, GLint, const struct gl_texture_image *);
 extern void fxDDTexParam(GLcontext *, GLenum, struct gl_texture_object *,

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 736654251231efc7920188f9b64ecaacd25fe43a..78397c46432974de9c7b1f6cb6bf9723e96c56eb 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1,4 +1,4 @@
-/* $Id: dd.h,v 1.15 2000/03/03 18:55:45 brianp Exp $ */
+/* $Id: dd.h,v 1.16 2000/03/07 17:11:29 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -564,12 +564,10 @@ struct dd_function_table {
     *** Texture mapping functions:
     ***/
 
-   void (*TexEnv)( GLcontext *ctx, GLenum pname, const GLfloat *param );
+   void (*TexEnv)( GLcontext *ctx, GLenum target, GLenum pname,
+                   const GLfloat *param );
    /*
     * Called whenever glTexEnv*() is called.
-    * Pname will be one of GL_TEXTURE_ENV_MODE or GL_TEXTURE_ENV_COLOR.
-    * If pname is GL_TEXTURE_ENV_MODE then param will be one
-    * of GL_MODULATE, GL_BLEND, GL_DECAL, or GL_REPLACE.
     */
 
    void (*TexImage)( GLcontext *ctx, GLenum target,

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 8604c445112884c2676c061e93682ef0d47a3880..e5f901255b48196732cb37ae04853fbf5657abec 100644 (file)
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,4 +1,4 @@
-/* $Id: texstate.c,v 1.7 2000/02/08 01:45:22 brianp Exp $ */
+/* $Id: texstate.c,v 1.8 2000/03/07 17:11:29 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -125,7 +125,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
 
    /* Tell device driver about the new texture environment */
    if (ctx->Driver.TexEnv) {
-      (*ctx->Driver.TexEnv)( ctx, pname, param );
+      (*ctx->Driver.TexEnv)( ctx, target, pname, param );
    }
 }