commit 45224face0d942094cc4426d2c84d441661a4c62
author Brian Paul <brian.paul@tungstengraphics.com> Tue Sep 07 22:31:30 1999 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Tue Sep 07 22:31:30 1999 +0000
tree ecd5d005b5c97710c26471dae85b8a725c0f9334
parent 2ca99ca2e7dee551b8f1730dbae2513f99828cfc

removed TexCoordUnit from GLcontext, use Array.ActiveTexture instead

src/mesa/main/varray.c

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index aab630c..fb8510e 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -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 @@
    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 @@
    gl_DisableClientState( ctx, GL_INDEX_ARRAY );
 
    /* Texcoords */
-   coordUnitSave = ctx->TexCoordUnit;
+   coordUnitSave = ctx->Array.ActiveTexture;
    if (tflag) {
       GLint i;
       GLint factor = ctx->Array.TexCoordInterleaveFactor;