added target parameter to Driver.TexEnv()
This commit is contained in:
@@ -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;
|
||||
|
||||
|
@@ -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 *,
|
||||
|
@@ -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,
|
||||
|
@@ -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 );
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user