From 62e1fae858509615c6e54e0b9388cfa2691a5919 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 14 Jun 2006 04:05:17 +0000 Subject: A number of vertex buffer fields like NormalPtr, FogCoordPtr, etc are really just aliases for members of the VB->AttribPtr[] array. Begin replacing FogCoordPtr with VB->AttribPtr[_TNL_ATTRIB_FOG], and similarly for NormalPtr, TexCoordPtr, PointSizePtr, etc. --- src/mesa/tnl/t_vb_normals.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/tnl/t_vb_normals.c') diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c index edcb4de6e9..0f91784e80 100644 --- a/src/mesa/tnl/t_vb_normals.c +++ b/src/mesa/tnl/t_vb_normals.c @@ -67,19 +67,19 @@ run_normal_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage) store->NormalTransform( ctx->ModelviewMatrixStack.Top, ctx->_ModelViewInvScale, - VB->NormalPtr, /* input normals */ + VB->AttribPtr[_TNL_ATTRIB_NORMAL], /* input normals */ lengths, &store->normal ); /* resulting normals */ - if (VB->NormalPtr->count > 1) { + if (VB->AttribPtr[_TNL_ATTRIB_NORMAL]->count > 1) { store->normal.stride = 4 * sizeof(GLfloat); } else { store->normal.stride = 0; } + VB->AttribPtr[_TNL_ATTRIB_NORMAL] = &store->normal; VB->NormalPtr = &store->normal; - VB->AttribPtr[_TNL_ATTRIB_NORMAL] = VB->NormalPtr; VB->NormalLengthPtr = NULL; /* no longer valid */ return GL_TRUE; -- cgit v1.2.3