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

removed TexCoordUnit from GLcontext, use Array.ActiveTexture instead

Browse Source
This commit is contained in:
Brian Paul
1999-09-07 22:31:30 +00:00
parent 2ca99ca2e7
commit 45224face0
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/main/context.c
View File

@@ -1,4 +1,4 @@
/* $Id: context.c,v 1.5 1999/09/04 14:40:49 keithw Exp $ */
/* $Id: context.c,v 1.6 1999/09/07 22:31:30 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1004,9 +1004,6 @@ static void initialize_context( GLcontext *ctx )
ctx->IntegerAccumMode = GL_TRUE;
ctx->IntegerAccumScaler = 0.0;
/* multitexture */
ctx->TexCoordUnit = 0;
/* Renderer and client attribute stacks */
ctx->AttribStackDepth = 0;
ctx->ClientAttribStackDepth = 0;

8
src/mesa/main/enable.c
View File

@@ -1,4 +1,4 @@
/* $Id: enable.c,v 1.3 1999/08/26 14:50:49 keithw Exp $ */
/* $Id: enable.c,v 1.4 1999/09/07 22:31:30 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -448,7 +448,7 @@ void gl_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
ctx->Array.Index.Enabled = state;
break;
case GL_TEXTURE_COORD_ARRAY:
ctx->Array.TexCoord[ctx->TexCoordUnit].Enabled = state;
ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled = state;
break;
case GL_EDGE_FLAG_ARRAY:
ctx->Array.EdgeFlag.Enabled = state;
@@ -638,7 +638,7 @@ GLboolean gl_IsEnabled( GLcontext* ctx, GLenum cap )
case GL_INDEX_ARRAY:
return ctx->Array.Index.Enabled;
case GL_TEXTURE_COORD_ARRAY:
return ctx->Array.TexCoord[ctx->TexCoordUnit].Enabled;
return ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled;
case GL_EDGE_FLAG_ARRAY:
return ctx->Array.EdgeFlag.Enabled;
default:
@@ -671,7 +671,7 @@ static void gl_client_state( GLcontext *ctx, GLenum cap, GLboolean state )
ctx->Array.Index.Enabled = state;
break;
case GL_TEXTURE_COORD_ARRAY:
ctx->Array.TexCoord[ctx->TexCoordUnit].Enabled = state;
ctx->Array.TexCoord[ctx->Array.ActiveTexture].Enabled = state;
break;
case GL_EDGE_FLAG_ARRAY:
ctx->Array.EdgeFlag.Enabled = state;

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

@@ -1,4 +1,4 @@
/* $Id: texstate.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */
/* $Id: texstate.c,v 1.2 1999/09/07 22:31:30 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1039,7 +1039,6 @@ void gl_ActiveTexture( GLcontext *ctx, GLenum target )
if (target >= GL_TEXTURE0_ARB && target < GL_TEXTURE0_ARB + maxUnits) {
GLint texUnit = target - GL_TEXTURE0_ARB;
ctx->TexCoordUnit = texUnit;
ctx->Texture.CurrentUnit = texUnit;
ctx->Texture.CurrentTransformUnit = texUnit;
if (ctx->Driver.ActiveTexture) {

6
src/mesa/main/varray.c
View File

@@ -1,4 +1,4 @@
/* $Id: varray.c,v 1.2 1999/08/26 14:50:49 keithw Exp $ */
/* $Id: varray.c,v 1.3 1999/09/07 22:31:30 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -285,7 +285,7 @@ void GLAPIENTRY glTexCoordPointer(CTX_ARG GLint size, GLenum type,
CHECK_CONTEXT;
ctx = CC;
texUnit = ctx->TexCoordUnit;
texUnit = ctx->Array.ActiveTexture;
if (size<1 || size>4) {
gl_error( ctx, GL_INVALID_VALUE, "glTexCoordPointer(size)" );
@@ -1135,7 +1135,7 @@ void GLAPIENTRY glInterleavedArrays(CTX_ARG GLenum format, GLsizei stride,
gl_DisableClientState( ctx, GL_INDEX_ARRAY );
/* Texcoords */
coordUnitSave = ctx->TexCoordUnit;
coordUnitSave = ctx->Array.ActiveTexture;
if (tflag) {
GLint i;
GLint factor = ctx->Array.TexCoordInterleaveFactor;