KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tnl: Replace deprecated FogCoordPtr with AttribPtr[_TNL_ATTRIB_FOG]

This commit is contained in:
Eric Anholt 2009-11-18 01:45:42 -08:00
parent 0a91878015
commit 37c79d4d76
12 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/drivers/dri/mach64/mach64_native_vbtmp.h
View File

@ -133,9 +133,9 @@ static void TAG(emit)( GLcontext *ctx,
#endif #endif
#if DO_FOG #if DO_FOG
if (VB->FogCoordPtr) { if (VB->AttribPtr[_TNL_ATTRIB_FOG]) {
fog = VB->FogCoordPtr->data; fog = VB->AttribPtr[_TNL_ATTRIB_FOG]->data;
fog_stride = VB->FogCoordPtr->stride; fog_stride = VB->AttribPtr[_TNL_ATTRIB_FOG]->stride;
} else { } else {
static GLfloat tmp[4] = {0, 0, 0, 0}; static GLfloat tmp[4] = {0, 0, 0, 0};
fog = &tmp; fog = &tmp;

6
src/mesa/drivers/dri/mach64/mach64_vbtmp.h
View File

@ -200,9 +200,9 @@ static void TAG(emit)( GLcontext *ctx,
} }
if (DO_FOG) { if (DO_FOG) {
if (VB->FogCoordPtr) { if (VB->AttribPtr[_TNL_ATTRIB_FOG]) {
fog = VB->FogCoordPtr->data; fog = VB->AttribPtr[_TNL_ATTRIB_FOG]->data;
fog_stride = VB->FogCoordPtr->stride; fog_stride = VB->AttribPtr[_TNL_ATTRIB_FOG]->stride;
} else { } else {
static GLfloat tmp[4] = {0, 0, 0, 0}; static GLfloat tmp[4] = {0, 0, 0, 0};
fog = &tmp; fog = &tmp;

4
src/mesa/drivers/dri/radeon/radeon_maos_arrays.c
View File

@ -273,8 +273,8 @@ void radeonEmitArrays( GLcontext *ctx, GLuint inputs )
if (!rmesa->tcl.fog.buf) if (!rmesa->tcl.fog.buf)
emit_vecfog( ctx, emit_vecfog( ctx,
&(rmesa->tcl.aos[nr]), &(rmesa->tcl.aos[nr]),
(char *)VB->FogCoordPtr->data, (char *)VB->AttribPtr[_TNL_ATTRIB_FOG]->data,
VB->FogCoordPtr->stride, VB->AttribPtr[_TNL_ATTRIB_FOG]->stride,
count); count);
vfmt |= RADEON_CP_VC_FRMT_FPFOG; vfmt |= RADEON_CP_VC_FRMT_FPFOG;

6
src/mesa/drivers/dri/radeon/radeon_maos_vbtmp.h
View File

@ -142,9 +142,9 @@ static void TAG(emit)( GLcontext *ctx,
} }
if (DO_SPEC_OR_FOG) { if (DO_SPEC_OR_FOG) {
if (VB->FogCoordPtr) { if (VB->AttribPtr[_TNL_ATTRIB_FOG]) {
fog = VB->FogCoordPtr->data; fog = VB->AttribPtr[_TNL_ATTRIB_FOG]->data;
fog_stride = VB->FogCoordPtr->stride; fog_stride = VB->AttribPtr[_TNL_ATTRIB_FOG]->stride;
} else { } else {
fog = (GLfloat (*)[4])ctx->Current.Attrib[VERT_ATTRIB_FOG]; fog = (GLfloat (*)[4])ctx->Current.Attrib[VERT_ATTRIB_FOG];
fog_stride = 0; fog_stride = 0;

4
src/mesa/drivers/dri/tdfx/tdfx_vbtmp.h
View File

@ -82,8 +82,8 @@ static void TAG(emit)( GLcontext *ctx,
} }
if (IND & TDFX_FOGC_BIT) { if (IND & TDFX_FOGC_BIT) {
fog = VB->FogCoordPtr->data; fog = VB->AttribPtr[_TNL_ATTRIB_FOG]->data;
fog_stride = VB->FogCoordPtr->stride; fog_stride = VB->AttribPtr[_TNL_ATTRIB_FOG]->stride;
} }
{ {

4
src/mesa/drivers/glide/fxvbtmp.h
View File

@ -91,8 +91,8 @@ static void TAG(emit)( GLcontext *ctx,
} }
if (IND & SETUP_FOGC) { if (IND & SETUP_FOGC) {
fog = VB->FogCoordPtr->data; fog = VB->AttribPtr[_TNL_ATTRIB_FOG]->data;
fog_stride = VB->FogCoordPtr->stride; fog_stride = VB->AttribPtr[_TNL_ATTRIB_FOG]->stride;
} }
if (start) { if (start) {

3
src/mesa/tnl/t_context.h
View File

@ -202,8 +202,6 @@ struct vertex_buffer
* it that is one of VERT_ATTRIB_X. For things only produced by TNL, * it that is one of VERT_ATTRIB_X. For things only produced by TNL,
* such as backface color or eye-space coordinates, they are stored * such as backface color or eye-space coordinates, they are stored
* here. * here.
* XXX some of these fields alias AttribPtr below and should be removed
* such as FogCoordPtr, etc.
*/ */
GLuint *Elts; GLuint *Elts;
GLvector4f *EyePtr; /* _TNL_BIT_POS */ GLvector4f *EyePtr; /* _TNL_BIT_POS */
@ -217,7 +215,6 @@ struct vertex_buffer
GLvector4f *BackfaceIndexPtr; GLvector4f *BackfaceIndexPtr;
GLvector4f *BackfaceColorPtr; GLvector4f *BackfaceColorPtr;
GLvector4f *BackfaceSecondaryColorPtr; GLvector4f *BackfaceSecondaryColorPtr;
GLvector4f *FogCoordPtr; /* _TNL_BIT_FOG */
const struct _mesa_prim *Primitive; const struct _mesa_prim *Primitive;
GLuint PrimitiveCount; GLuint PrimitiveCount;

5
src/mesa/tnl/t_draw.c
View File

@ -251,13 +251,10 @@ static void bind_inputs( GLcontext *ctx,
*/ */
VB->Count = count; VB->Count = count;
/* These should perhaps be part of _TNL_ATTRIB_* */
/* Legacy pointers -- remove one day.
*/
VB->BackfaceColorPtr = NULL; VB->BackfaceColorPtr = NULL;
VB->BackfaceIndexPtr = NULL; VB->BackfaceIndexPtr = NULL;
VB->BackfaceSecondaryColorPtr = NULL; VB->BackfaceSecondaryColorPtr = NULL;
VB->FogCoordPtr = VB->AttribPtr[_TNL_ATTRIB_FOG];
/* Clipping and drawing code still requires this to be a packed /* Clipping and drawing code still requires this to be a packed
* array of ubytes which can be written into. TODO: Fix and * array of ubytes which can be written into. TODO: Fix and

1
src/mesa/tnl/t_vb_fog.c
View File

@ -228,7 +228,6 @@ run_fog_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
VB->AttribPtr[_TNL_ATTRIB_FOG] = input; VB->AttribPtr[_TNL_ATTRIB_FOG] = input;
} }
VB->FogCoordPtr = VB->AttribPtr[_TNL_ATTRIB_FOG];
return GL_TRUE; return GL_TRUE;
} }

8
src/mesa/tnl/t_vb_program.c
View File

@ -454,16 +454,12 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
VB->ClipPtr->count = VB->Count; VB->ClipPtr->count = VB->Count;
} }
VB->AttribPtr[_TNL_ATTRIB_COLOR0] = &store->results[VERT_RESULT_COL0];
VB->BackfaceColorPtr = &store->results[VERT_RESULT_BFC0];
VB->AttribPtr[_TNL_ATTRIB_COLOR1] = &store->results[VERT_RESULT_COL1];
VB->BackfaceSecondaryColorPtr = &store->results[VERT_RESULT_BFC1];
VB->FogCoordPtr = &store->results[VERT_RESULT_FOGC];
VB->AttribPtr[VERT_ATTRIB_COLOR0] = &store->results[VERT_RESULT_COL0]; VB->AttribPtr[VERT_ATTRIB_COLOR0] = &store->results[VERT_RESULT_COL0];
VB->AttribPtr[VERT_ATTRIB_COLOR1] = &store->results[VERT_RESULT_COL1]; VB->AttribPtr[VERT_ATTRIB_COLOR1] = &store->results[VERT_RESULT_COL1];
VB->AttribPtr[VERT_ATTRIB_FOG] = &store->results[VERT_RESULT_FOGC]; VB->AttribPtr[VERT_ATTRIB_FOG] = &store->results[VERT_RESULT_FOGC];
VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->results[VERT_RESULT_PSIZ]; VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->results[VERT_RESULT_PSIZ];
VB->BackfaceColorPtr = &store->results[VERT_RESULT_BFC0];
VB->BackfaceSecondaryColorPtr = &store->results[VERT_RESULT_BFC1];
for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) { for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
VB->AttribPtr[_TNL_ATTRIB_TEX0 + i] VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]

6
src/mesa/tnl_dd/t_dd_vbtmp.h
View File

@ -200,9 +200,9 @@ static void TAG(emit)( GLcontext *ctx,
} }
if (DO_FOG) { if (DO_FOG) {
if (VB->FogCoordPtr) { if (VB->AttribPtr[_TNL_ATTRIB_FOG]) {
fog = VB->FogCoordPtr->data; fog = VB->AttribPtr[_TNL_ATTRIB_FOG]->data;
fog_stride = VB->FogCoordPtr->stride; fog_stride = VB->AttribPtr[_TNL_ATTRIB_FOG]->stride;
} }
else { else {
static GLfloat tmp[4] = {0, 0, 0, 0}; static GLfloat tmp[4] = {0, 0, 0, 0};

2
src/mesa/x86/gen_matypes.c
View File

@ -135,7 +135,7 @@ int main( int argc, char **argv )
OFFSET( "VB_INDEX_PTR ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR_INDEX] ); OFFSET( "VB_INDEX_PTR ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR_INDEX] );
OFFSET( "VB_COLOR_PTR ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR0] ); OFFSET( "VB_COLOR_PTR ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR0] );
OFFSET( "VB_SECONDARY_COLOR_PTR ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR1] ); OFFSET( "VB_SECONDARY_COLOR_PTR ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_COLOR1] );
OFFSET( "VB_FOG_COORD_PTR ", struct vertex_buffer, FogCoordPtr ); OFFSET( "VB_FOG_COORD_PTR ", struct vertex_buffer, AttribPtr[_TNL_ATTRIB_FOG] );
OFFSET( "VB_PRIMITIVE ", struct vertex_buffer, Primitive ); OFFSET( "VB_PRIMITIVE ", struct vertex_buffer, Primitive );
printf( "\n" ); printf( "\n" );