diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dd.h | 8 | ||||
| -rw-r--r-- | src/mesa/main/texstate.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 7366542512..78397c4643 100644 --- 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 8604c44511..e5f901255b 100644 --- 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 ); } } |