summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-03-10 16:17:35 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-03-10 16:17:35 +0000
commitab928e57b9637abd253c5114d0c90d7e3cb3f7fd (patch)
tree2a5e296120f6f2b6f0e28054b057da564f7a5155 /src/mesa
parent30e6dda36837c47dfc75e5d54eef998c998e2a9a (diff)
don't futz with GL_CLIENT_ACTIVE_TEXTURE in glClientActiveTexture (Robert Merrill)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/varray.c26
1 files changed, 4 insertions, 22 deletions
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 52f8c8cef9..04d0a07e28 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
- * Version: 5.1
+ * Version: 6.1
*
- * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -625,7 +625,6 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
const GLint toffset = 0; /* always zero */
GLint defstride; /* default stride */
GLint c, f;
- GLint coordUnitSave;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -756,31 +755,14 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
_mesa_DisableClientState( GL_INDEX_ARRAY );
/* Texcoords */
- coordUnitSave = ctx->Array.ActiveTexture;
if (tflag) {
- GLuint i=0;
- /* enable unit 0 texcoord array */
- _mesa_ClientActiveTextureARB( GL_TEXTURE0_ARB );
_mesa_EnableClientState( GL_TEXTURE_COORD_ARRAY );
_mesa_TexCoordPointer( tcomps, GL_FLOAT, stride,
- (GLubyte *) pointer + i * toffset );
- /* disable all other texcoord arrays */
- for (i = 1; i < ctx->Const.MaxTextureCoordUnits; i++) {
- _mesa_ClientActiveTextureARB( (GLenum) (GL_TEXTURE0_ARB + i) );
- _mesa_DisableClientState( GL_TEXTURE_COORD_ARRAY );
- }
+ (GLubyte *) pointer + toffset );
}
else {
- /* disable all texcoord arrays */
- GLuint i;
- for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
- _mesa_ClientActiveTextureARB( (GLenum) (GL_TEXTURE0_ARB + i) );
- _mesa_DisableClientState( GL_TEXTURE_COORD_ARRAY );
- }
+ _mesa_DisableClientState( GL_TEXTURE_COORD_ARRAY );
}
- /* Restore texture coordinate unit index */
- _mesa_ClientActiveTextureARB( (GLenum) (GL_TEXTURE0_ARB + coordUnitSave) );
-
/* Color */
if (cflag) {