OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added target parameter to Driver.TexEnv()

Browse Source
This commit is contained in:
Brian Paul
2000-03-07 17:11:29 +00:00
parent e02ffc1226
commit b3f16c4350
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/glide/fxddtex.c
View File

@@ -161,7 +161,7 @@ void fxDDTexBind(GLcontext *ctx, GLenum target, struct gl_texture_object *tObj)
ctx->Driver.RenderStart = fxSetupFXUnits; 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; fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;

2
src/mesa/drivers/glide/fxdrv.h
View File

@@ -567,7 +567,7 @@ extern void fxUpdateDDSpanPointers(GLcontext *);
extern void fxSetupDDSpanPointers(GLcontext *); extern void fxSetupDDSpanPointers(GLcontext *);
extern void fxPrintTextureData(tfxTexInfo *ti); 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 *, extern void fxDDTexImg(GLcontext *, GLenum, struct gl_texture_object *,
GLint, GLint, const struct gl_texture_image *); GLint, GLint, const struct gl_texture_image *);
extern void fxDDTexParam(GLcontext *, GLenum, struct gl_texture_object *, extern void fxDDTexParam(GLcontext *, GLenum, struct gl_texture_object *,

8
src/mesa/main/dd.h
View File

@@ -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 * Mesa 3-D graphics library
@@ -564,12 +564,10 @@ struct dd_function_table {
*** Texture mapping functions: *** 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. * 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, void (*TexImage)( GLcontext *ctx, GLenum target,

4
src/mesa/main/texstate.c
View File

@@ -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 * 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 */ /* Tell device driver about the new texture environment */
if (ctx->Driver.TexEnv) { if (ctx->Driver.TexEnv) {
(*ctx->Driver.TexEnv)( ctx, pname, param ); (*ctx->Driver.TexEnv)( ctx, target, pname, param );
} }
} }