diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-02-23 21:07:12 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-02-23 21:07:12 +0000 |
commit | cf20f8cc3f92fcc6441b55a793bcede0d83a2a69 (patch) | |
tree | 4cb5aff95a598c34debe0828d753d53591d66f01 /src/mesa/drivers/dri/unichrome/via_dd_tritmp.h | |
parent | 537f42e24042292a34048a2e48844fbe4e9267e0 (diff) |
updates from Erdi Chen
Diffstat (limited to 'src/mesa/drivers/dri/unichrome/via_dd_tritmp.h')
-rw-r--r-- | src/mesa/drivers/dri/unichrome/via_dd_tritmp.h | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_dd_tritmp.h b/src/mesa/drivers/dri/unichrome/via_dd_tritmp.h index e9af518212..da70ced25c 100644 --- a/src/mesa/drivers/dri/unichrome/via_dd_tritmp.h +++ b/src/mesa/drivers/dri/unichrome/via_dd_tritmp.h @@ -167,12 +167,12 @@ static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2) else { GLfloat *vbindex = (GLfloat*) VB->IndexPtr[1]->data; if (!DO_FLAT) { - //VERT_SAVE_IND( 0 ); - //VERT_SAVE_IND( 1 ); + VERT_SAVE_IND( 0 ); + VERT_SAVE_IND( 1 ); VERT_SET_IND(v[0], vbindex[e0]); VERT_SET_IND(v[1], vbindex[e1]); } - //VERT_SAVE_IND( 2 ); + VERT_SAVE_IND( 2 ); VERT_SET_IND(v[2], vbindex[e2]); } } @@ -269,20 +269,11 @@ static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2) } } else { -#if 0 // XXX TODO _SOLO - GLuint *vbindex = VB->IndexPtr[0]->data; - if (!DO_FLAT) { - VERT_SET_IND(v[0], vbindex[e0]); - VERT_SET_IND(v[1], vbindex[e1]); - } - VERT_SET_IND(v[2], vbindex[e2]); -#else if (!DO_FLAT) { VERT_RESTORE_IND( 0 ); VERT_RESTORE_IND( 1 ); } VERT_RESTORE_IND( 2 ); -#endif } } @@ -419,14 +410,14 @@ static void TAG(quad)(GLcontext *ctx, else { GLfloat *vbindex = (GLfloat*) VB->IndexPtr[1]->data; if (!DO_FLAT) { - //VERT_SAVE_IND( 0 ); - //VERT_SAVE_IND( 1 ); - //VERT_SAVE_IND( 2 ); + VERT_SAVE_IND( 0 ); + VERT_SAVE_IND( 1 ); + VERT_SAVE_IND( 2 ); VERT_SET_IND(v[0], vbindex[e0]); VERT_SET_IND(v[1], vbindex[e1]); VERT_SET_IND(v[2], vbindex[e2]); } - //VERT_SAVE_IND( 3 ); + VERT_SAVE_IND( 3 ); VERT_SET_IND(v[3], vbindex[e3]); } } @@ -536,22 +527,12 @@ static void TAG(quad)(GLcontext *ctx, } } else { -#if 0 // XXX TODO _SOLO - GLuint *vbindex = VB->IndexPtr[0]->data; - if (!DO_FLAT) { - VERT_SET_IND(v[0], vbindex[e0]); - VERT_SET_IND(v[1], vbindex[e1]); - VERT_SET_IND(v[2], vbindex[e2]); - } - VERT_SET_IND(v[3], vbindex[e3]); -#else if (!DO_FLAT) { VERT_RESTORE_IND( 0 ); VERT_RESTORE_IND( 1 ); VERT_RESTORE_IND( 2 ); } VERT_RESTORE_IND( 3 ); -#endif } } |