diff options
author | Eric Anholt <eric@anholt.net> | 2009-11-18 01:38:55 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-19 11:47:05 +0100 |
commit | 0a9187801505130738ae947c69cafa8a1dd118d1 (patch) | |
tree | ff0c2c6da3efff67337a7f855f68a700ef8148de /src/mesa/tnl_dd/t_dd_vbtmp.h | |
parent | fc9a2970dc539b21b035ea0a770ec69822962145 (diff) | |
download | external_mesa3d-0a9187801505130738ae947c69cafa8a1dd118d1.zip external_mesa3d-0a9187801505130738ae947c69cafa8a1dd118d1.tar.gz external_mesa3d-0a9187801505130738ae947c69cafa8a1dd118d1.tar.bz2 |
tnl: Replace deprecated ColorPtr[] with AttribPtr or new BackfaceColorPtr.
Diffstat (limited to 'src/mesa/tnl_dd/t_dd_vbtmp.h')
-rw-r--r-- | src/mesa/tnl_dd/t_dd_vbtmp.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/tnl_dd/t_dd_vbtmp.h b/src/mesa/tnl_dd/t_dd_vbtmp.h index c1cc6ae..a35218a 100644 --- a/src/mesa/tnl_dd/t_dd_vbtmp.h +++ b/src/mesa/tnl_dd/t_dd_vbtmp.h @@ -184,15 +184,15 @@ static void TAG(emit)( GLcontext *ctx, } if (DO_RGBA) { - col_stride = VB->ColorPtr[0]->stride; - col = VB->ColorPtr[0]->data; - col_size = VB->ColorPtr[0]->size; + col_stride = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->stride; + col = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->data; + col_size = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->size; } if (DO_SPEC) { - if (VB->SecondaryColorPtr[0]) { - spec_stride = VB->SecondaryColorPtr[0]->stride; - spec = VB->SecondaryColorPtr[0]->data; + if (VB->AttribPtr[_TNL_ATTRIB_COLOR1]) { + spec_stride = VB->AttribPtr[_TNL_ATTRIB_COLOR1]->stride; + spec = VB->AttribPtr[_TNL_ATTRIB_COLOR1]->data; } else { spec = (GLfloat (*)[4])ctx->Current.Attrib[VERT_ATTRIB_COLOR1]; spec_stride = 0; @@ -356,9 +356,9 @@ static void TAG(emit)( GLcontext *ctx, GLuint start, GLuint end, ASSERT(stride == 4); - col = VB->ColorPtr[0]->data; - col_stride = VB->ColorPtr[0]->stride; - col_size = VB->ColorPtr[0]->size; + col = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->data; + col_stride = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->stride; + col_size = VB->AttribPtr[_TNL_ATTRIB_COLOR0]->size; /* fprintf(stderr, "%s(small) importable %x\n", */ /* __FUNCTION__, VB->importable_data); */ |