summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <[email protected]>2006-03-30 19:23:38 +0000
committerAdam Jackson <[email protected]>2006-03-30 19:23:38 +0000
commit823c581f7cbb90239d3f31f721cabd5bbf88dad9 (patch)
tree4d20a1d1be09c356c003de68bfca5eb37263dff9
parent898269798185a58304e52e83f0fc1f0353d4a4d3 (diff)
Revert my change from 1.37 as being bogus (see ensuing list discussion for
rationale).
-rw-r--r--src/mesa/main/api_arrayelt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index d4c69d25ea8..e905f164025 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -670,7 +670,7 @@ static void _ae_update_state( GLcontext *ctx )
aa++;
}
for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
- if (ctx->Array.TexCoord[i].Enabled && ctx->Array.TexCoord[i].Ptr) {
+ if (ctx->Array.TexCoord[i].Enabled) {
/* NOTE: we use generic glVertexAttrib functions here.
* If we ever de-alias conventional/generic vertex attribs this
* will have to change.
@@ -685,8 +685,7 @@ static void _ae_update_state( GLcontext *ctx )
/* generic vertex attribute arrays */
for (i = 1; i < VERT_ATTRIB_MAX; i++) { /* skip zero! */
- if (ctx->Array.VertexAttrib[i].Enabled &&
- ctx->Array.VertexAttrib[i].Ptr) {
+ if (ctx->Array.VertexAttrib[i].Enabled) {
struct gl_client_array *attribArray = &ctx->Array.VertexAttrib[i];
at->array = attribArray;
/* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV