t_dd_dmatmp: Indentation and formatting fixes after HAVE_LINE_STRIPS change
[mesa.git] / src / mesa / tnl_dd / t_dd_tritmp.h
index 6acd837317f5dd870d2e9d613c54275f6ee0c635..2176f1f1667387affee656dd033c9b1a6623dc3f 100644 (file)
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
  * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
+ *    Keith Whitwell <keithw@vmware.com>
  */
 
 
@@ -42,7 +42,6 @@
  * DO_UNFILLED:  Decompose triangles to lines and points where appropriate.
  * DO_TWOSTENCIL:Gross hack for two-sided stencil.
  *
- * HAVE_RGBA: Vertices have rgba values (otherwise index values).
  * HAVE_SPEC: Vertices have secondary rgba values.
  *
  * VERT_X(v): Alias for vertex x value.
  * VERT_COPY_RGBA: Copy vertex rgba another vertex.
  * VERT_SAVE_RGBA: Save vertex rgba to a local variable.
  * VERT_RESTORE_RGBA: Restore vertex rgba from a local variable.
- *   --> Similar for IND and SPEC.
+ *   --> Similar for SPEC.
  *
  * LOCAL_VARS(n): (At least) define local vars for save/restore rgba.
  *
  */
 
-#if HAVE_RGBA
-#define VERT_SET_IND( v, c ) (void) c
-#define VERT_COPY_IND( v0, v1 )
-#define VERT_SAVE_IND( idx )
-#define VERT_RESTORE_IND( idx )
 #if HAVE_BACK_COLORS
 #define VERT_SET_RGBA( v, c )
 #endif
-#else
-#define VERT_SET_RGBA( v, c ) (void) c
-#define VERT_COPY_RGBA( v0, v1 )
-#define VERT_SAVE_RGBA( idx )
-#define VERT_RESTORE_RGBA( idx )
-#if HAVE_BACK_COLORS
-#define VERT_SET_IND( v, c )
-#endif
-#endif
 
 #if !HAVE_SPEC
 #define VERT_SET_SPEC( v, c ) (void) c
@@ -99,7 +84,6 @@
 
 #if !HAVE_BACK_COLORS
 #define VERT_COPY_SPEC1( v )
-#define VERT_COPY_IND1( v )
 #define VERT_COPY_RGBA1( v )
 #endif
 
 #endif
 
 #if DO_TRI
-static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
+static void TAG(triangle)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint e2 )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
    VERTEX *v[3];
@@ -137,7 +121,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
    GLuint facing = 0;
    LOCAL_VARS(3);
 
-/*     fprintf(stderr, "%s\n", __FUNCTION__); */
+/*     fprintf(stderr, "%s\n", __func__); */
 
    v[0] = (VERTEX *)GET_VERTEX(e0);
    v[1] = (VERTEX *)GET_VERTEX(e1);
@@ -171,82 +155,68 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
            }
         }
 
-        if (DO_TWOSIDE && facing == 1)
-        {
-           if (HAVE_RGBA) {
-              if (HAVE_BACK_COLORS) {
+        if (DO_TWOSIDE && facing == 1) {
+           if (HAVE_BACK_COLORS) {
+              if (!DO_FLAT) {
+                 VERT_SAVE_RGBA( 0 );
+                 VERT_SAVE_RGBA( 1 );
+                 VERT_COPY_RGBA1( v[0] );
+                 VERT_COPY_RGBA1( v[1] );
+              }
+              VERT_SAVE_RGBA( 2 );
+              VERT_COPY_RGBA1( v[2] );
+              if (HAVE_SPEC) {
                  if (!DO_FLAT) {
-                    VERT_SAVE_RGBA( 0 );
-                    VERT_SAVE_RGBA( 1 );
-                    VERT_COPY_RGBA1( v[0] );
-                    VERT_COPY_RGBA1( v[1] );
-                 }
-                 VERT_SAVE_RGBA( 2 );
-                 VERT_COPY_RGBA1( v[2] );
-                 if (HAVE_SPEC) {
-                    if (!DO_FLAT) {
-                       VERT_SAVE_SPEC( 0 );
-                       VERT_SAVE_SPEC( 1 );
-                       VERT_COPY_SPEC1( v[0] );
-                       VERT_COPY_SPEC1( v[1] );
-                    }
-                    VERT_SAVE_SPEC( 2 );
-                    VERT_COPY_SPEC1( v[2] );
+                    VERT_SAVE_SPEC( 0 );
+                    VERT_SAVE_SPEC( 1 );
+                    VERT_COPY_SPEC1( v[0] );
+                    VERT_COPY_SPEC1( v[1] );
                  }
+                 VERT_SAVE_SPEC( 2 );
+                 VERT_COPY_SPEC1( v[2] );
               }
-              else {
-                 GLfloat (*vbcolor)[4] = VB->BackfaceColorPtr->data;
-                 (void) vbcolor;
+           }
+           else {
+              GLfloat (*vbcolor)[4] = VB->BackfaceColorPtr->data;
+              (void) vbcolor;
 
-                 if (!DO_FLAT) {
-                    VERT_SAVE_RGBA( 0 );
-                    VERT_SAVE_RGBA( 1 );
-                 }
-                 VERT_SAVE_RGBA( 2 );
+              if (!DO_FLAT) {
+                 VERT_SAVE_RGBA( 0 );
+                 VERT_SAVE_RGBA( 1 );
+              }
+              VERT_SAVE_RGBA( 2 );
 
-                 if (VB->BackfaceColorPtr->stride) {
-                    ASSERT(VB->BackfaceColorPtr->stride == 4*sizeof(GLfloat));
+              if (VB->BackfaceColorPtr->stride) {
+                 assert(VB->BackfaceColorPtr->stride == 4*sizeof(GLfloat));
 
-                    if (!DO_FLAT) {              
-                       VERT_SET_RGBA( v[0], vbcolor[e0] );
-                       VERT_SET_RGBA( v[1], vbcolor[e1] );
-                    }
-                    VERT_SET_RGBA( v[2], vbcolor[e2] );
+                 if (!DO_FLAT) {
+                    VERT_SET_RGBA( v[0], vbcolor[e0] );
+                    VERT_SET_RGBA( v[1], vbcolor[e1] );
                  }
-                 else {
-                    if (!DO_FLAT) {              
-                       VERT_SET_RGBA( v[0], vbcolor[0] );
-                       VERT_SET_RGBA( v[1], vbcolor[0] );
-                    }
-                    VERT_SET_RGBA( v[2], vbcolor[0] );
+                 VERT_SET_RGBA( v[2], vbcolor[e2] );
+              }
+              else {
+                 if (!DO_FLAT) {
+                    VERT_SET_RGBA( v[0], vbcolor[0] );
+                    VERT_SET_RGBA( v[1], vbcolor[0] );
                  }
+                 VERT_SET_RGBA( v[2], vbcolor[0] );
+              }
 
-                 if (HAVE_SPEC && VB->BackfaceSecondaryColorPtr) {
-                    GLfloat (*vbspec)[4] = VB->BackfaceSecondaryColorPtr->data;
-                    ASSERT(VB->BackfaceSecondaryColorPtr->stride == 4*sizeof(GLfloat));
+              if (HAVE_SPEC && VB->BackfaceSecondaryColorPtr) {
+                 GLfloat (*vbspec)[4] = VB->BackfaceSecondaryColorPtr->data;
+                 assert(VB->BackfaceSecondaryColorPtr->stride == 4*sizeof(GLfloat));
 
-                    if (!DO_FLAT) {
-                       VERT_SAVE_SPEC( 0 );
-                       VERT_SAVE_SPEC( 1 );
-                       VERT_SET_SPEC( v[0], vbspec[e0] );
-                       VERT_SET_SPEC( v[1], vbspec[e1] );
-                    }
-                    VERT_SAVE_SPEC( 2 );
-                    VERT_SET_SPEC( v[2], vbspec[e2] );
+                 if (!DO_FLAT) {
+                    VERT_SAVE_SPEC( 0 );
+                    VERT_SAVE_SPEC( 1 );
+                    VERT_SET_SPEC( v[0], vbspec[e0] );
+                    VERT_SET_SPEC( v[1], vbspec[e1] );
                  }
+                 VERT_SAVE_SPEC( 2 );
+                 VERT_SET_SPEC( v[2], vbspec[e2] );
               }
            }
-           else {
-              GLfloat (*vbindex) = (GLfloat *)VB->BackfaceIndexPtr->data;
-              if (!DO_FLAT) {
-                 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_SET_IND( v[2], vbindex[e2] );
-           }
         }
       }
 
@@ -274,23 +244,15 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
    }
 
    if (DO_FLAT) {
-      if (HAVE_RGBA) {
-        VERT_SAVE_RGBA( 0 );
-        VERT_SAVE_RGBA( 1 );
-        VERT_COPY_RGBA( v[0], v[2] );
-        VERT_COPY_RGBA( v[1], v[2] );
-        if (HAVE_SPEC && VB->AttribPtr[_TNL_ATTRIB_COLOR1]) {
-           VERT_SAVE_SPEC( 0 );
-           VERT_SAVE_SPEC( 1 );
-           VERT_COPY_SPEC( v[0], v[2] );
-           VERT_COPY_SPEC( v[1], v[2] );
-        }
-      }
-      else {
-        VERT_SAVE_IND( 0 );
-        VERT_SAVE_IND( 1 );
-        VERT_COPY_IND( v[0], v[2] );
-        VERT_COPY_IND( v[1], v[2] );
+      VERT_SAVE_RGBA( 0 );
+      VERT_SAVE_RGBA( 1 );
+      VERT_COPY_RGBA( v[0], v[2] );
+      VERT_COPY_RGBA( v[1], v[2] );
+      if (HAVE_SPEC && VB->AttribPtr[_TNL_ATTRIB_COLOR1]) {
+        VERT_SAVE_SPEC( 0 );
+        VERT_SAVE_SPEC( 1 );
+        VERT_COPY_SPEC( v[0], v[2] );
+        VERT_COPY_SPEC( v[1], v[2] );
       }
    }
 
@@ -326,8 +288,9 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
         VERT_Z_ADD(v[1], offset);
         VERT_Z_ADD(v[2], offset);
       }
-      if (DO_UNFILLED)
+      if (DO_UNFILLED) {
         RASTERIZE( GL_TRIANGLES );
+      }
       if (DO_TWOSTENCIL && !HAVE_STENCIL_TWOSIDE && ctx->Stencil.TestTwoSide) {
          SETUP_STENCIL(facing);
          TRI( v[0], v[1], v[2] );
@@ -344,52 +307,36 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 )
       VERT_SET_Z(v[2], z[2]);
    }
 
-   if (DO_TWOSIDE && facing == 1)
-   {
-      if (HAVE_RGBA) {
-        if (!DO_FLAT) {
-           VERT_RESTORE_RGBA( 0 );
-           VERT_RESTORE_RGBA( 1 );
-        }
-        VERT_RESTORE_RGBA( 2 );
-        if (HAVE_SPEC) {
-           if (!DO_FLAT) {
-              VERT_RESTORE_SPEC( 0 );
-              VERT_RESTORE_SPEC( 1 );
-           }
-           VERT_RESTORE_SPEC( 2 );
-        }
+   if (DO_TWOSIDE && facing == 1) {
+      if (!DO_FLAT) {
+        VERT_RESTORE_RGBA( 0 );
+        VERT_RESTORE_RGBA( 1 );
       }
-      else {
+      VERT_RESTORE_RGBA( 2 );
+      if (HAVE_SPEC) {
         if (!DO_FLAT) {
-           VERT_RESTORE_IND( 0 );
-           VERT_RESTORE_IND( 1 );
+           VERT_RESTORE_SPEC( 0 );
+           VERT_RESTORE_SPEC( 1 );
         }
-        VERT_RESTORE_IND( 2 );
+        VERT_RESTORE_SPEC( 2 );
       }
    }
 
 
    if (DO_FLAT) {
-      if (HAVE_RGBA) {
         VERT_RESTORE_RGBA( 0 );
         VERT_RESTORE_RGBA( 1 );
         if (HAVE_SPEC && VB->AttribPtr[_TNL_ATTRIB_COLOR1]) {
            VERT_RESTORE_SPEC( 0 );
            VERT_RESTORE_SPEC( 1 );
         }
-      }
-      else {
-        VERT_RESTORE_IND( 0 );
-        VERT_RESTORE_IND( 1 );
-      }
    }
 }
 #endif
 
 #if DO_QUAD
 #if DO_FULL_QUAD
-static void TAG(quadr)( GLcontext *ctx,
+static void TAG(quadr)( struct gl_context *ctx,
                       GLuint e0, GLuint e1, GLuint e2, GLuint e3 )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
@@ -433,90 +380,74 @@ static void TAG(quadr)( GLcontext *ctx,
            }
         }
 
-        if (DO_TWOSIDE && facing == 1)
-        {
-           if (HAVE_RGBA) {
-              GLfloat (*vbcolor)[4] = VB->BackfaceColorPtr->data;
-              (void)vbcolor;
-
-              if (HAVE_BACK_COLORS) {
-                  if (!DO_FLAT) {
-                     VERT_SAVE_RGBA( 0 );
-                     VERT_SAVE_RGBA( 1 );
-                     VERT_SAVE_RGBA( 2 );
-                    VERT_COPY_RGBA1( v[0] );
-                    VERT_COPY_RGBA1( v[1] );
-                    VERT_COPY_RGBA1( v[2] );
-                 }
-                 VERT_SAVE_RGBA( 3 );
-                 VERT_COPY_RGBA1( v[3] );
-                 if (HAVE_SPEC) {
-                     if (!DO_FLAT) {
-                        VERT_SAVE_SPEC( 0 );
-                        VERT_SAVE_SPEC( 1 );
-                        VERT_SAVE_SPEC( 2 );
-                       VERT_COPY_SPEC1( v[0] );
-                       VERT_COPY_SPEC1( v[1] );
-                       VERT_COPY_SPEC1( v[2] );
-                    }
-                    VERT_SAVE_SPEC( 3 );
-                    VERT_COPY_SPEC1( v[3] );
-                 }
+        if (DO_TWOSIDE && facing == 1) {
+           GLfloat (*vbcolor)[4] = VB->BackfaceColorPtr->data;
+           (void)vbcolor;
+
+           if (HAVE_BACK_COLORS) {
+              if (!DO_FLAT) {
+                 VERT_SAVE_RGBA( 0 );
+                 VERT_SAVE_RGBA( 1 );
+                 VERT_SAVE_RGBA( 2 );
+                 VERT_COPY_RGBA1( v[0] );
+                 VERT_COPY_RGBA1( v[1] );
+                 VERT_COPY_RGBA1( v[2] );
               }
-              else {
-                 if (!DO_FLAT) {
-                    VERT_SAVE_RGBA( 0 );
-                    VERT_SAVE_RGBA( 1 );
-                    VERT_SAVE_RGBA( 2 );
-                 }
-                 VERT_SAVE_RGBA( 3 );
-
-                 if (VB->BackfaceColorPtr->stride) {
-                    if (!DO_FLAT) {
-                       VERT_SET_RGBA( v[0], vbcolor[e0] );
-                       VERT_SET_RGBA( v[1], vbcolor[e1] );
-                       VERT_SET_RGBA( v[2], vbcolor[e2] );
-                    }
-                    VERT_SET_RGBA( v[3], vbcolor[e3] );
-                 }
-                 else {
-                    if (!DO_FLAT) {
-                       VERT_SET_RGBA( v[0], vbcolor[0] );
-                       VERT_SET_RGBA( v[1], vbcolor[0] );
-                       VERT_SET_RGBA( v[2], vbcolor[0] );
-                    }
-                    VERT_SET_RGBA( v[3], vbcolor[0] );
+              VERT_SAVE_RGBA( 3 );
+              VERT_COPY_RGBA1( v[3] );
+              if (HAVE_SPEC) {
+                 if (!DO_FLAT) {
+                    VERT_SAVE_SPEC( 0 );
+                    VERT_SAVE_SPEC( 1 );
+                    VERT_SAVE_SPEC( 2 );
+                    VERT_COPY_SPEC1( v[0] );
+                    VERT_COPY_SPEC1( v[1] );
+                    VERT_COPY_SPEC1( v[2] );
                  }
-
-                 if (HAVE_SPEC && VB->BackfaceSecondaryColorPtr) {
-                    GLfloat (*vbspec)[4] = VB->BackfaceSecondaryColorPtr->data;
-                    ASSERT(VB->BackfaceSecondaryColorPtr->stride==4*sizeof(GLfloat));
-
-                    if (!DO_FLAT) {
-                       VERT_SAVE_SPEC( 0 );
-                       VERT_SAVE_SPEC( 1 );
-                       VERT_SAVE_SPEC( 2 );
-                       VERT_SET_SPEC( v[0], vbspec[e0] );
-                       VERT_SET_SPEC( v[1], vbspec[e1] );
-                       VERT_SET_SPEC( v[2], vbspec[e2] );
-                    }
-                    VERT_SAVE_SPEC( 3 );
-                    VERT_SET_SPEC( v[3], vbspec[e3] );
-                 }
+                 VERT_SAVE_SPEC( 3 );
+                 VERT_COPY_SPEC1( v[3] );
               }
            }
            else {
-              GLfloat *vbindex = (GLfloat *)VB->BackfaceIndexPtr->data;
               if (!DO_FLAT) {
-                 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_RGBA( 0 );
+                 VERT_SAVE_RGBA( 1 );
+                 VERT_SAVE_RGBA( 2 );
+              }
+              VERT_SAVE_RGBA( 3 );
+
+              if (VB->BackfaceColorPtr->stride) {
+                 if (!DO_FLAT) {
+                    VERT_SET_RGBA( v[0], vbcolor[e0] );
+                    VERT_SET_RGBA( v[1], vbcolor[e1] );
+                    VERT_SET_RGBA( v[2], vbcolor[e2] );
+                 }
+                 VERT_SET_RGBA( v[3], vbcolor[e3] );
+              }
+              else {
+                 if (!DO_FLAT) {
+                    VERT_SET_RGBA( v[0], vbcolor[0] );
+                    VERT_SET_RGBA( v[1], vbcolor[0] );
+                    VERT_SET_RGBA( v[2], vbcolor[0] );
+                 }
+                 VERT_SET_RGBA( v[3], vbcolor[0] );
+              }
+
+              if (HAVE_SPEC && VB->BackfaceSecondaryColorPtr) {
+                 GLfloat (*vbspec)[4] = VB->BackfaceSecondaryColorPtr->data;
+                 assert(VB->BackfaceSecondaryColorPtr->stride==4*sizeof(GLfloat));
+
+                 if (!DO_FLAT) {
+                    VERT_SAVE_SPEC( 0 );
+                    VERT_SAVE_SPEC( 1 );
+                    VERT_SAVE_SPEC( 2 );
+                    VERT_SET_SPEC( v[0], vbspec[e0] );
+                    VERT_SET_SPEC( v[1], vbspec[e1] );
+                    VERT_SET_SPEC( v[2], vbspec[e2] );
+                 }
+                 VERT_SAVE_SPEC( 3 );
+                 VERT_SET_SPEC( v[3], vbspec[e3] );
               }
-              VERT_SAVE_IND( 3 );
-              VERT_SET_IND( v[3], vbindex[e3] );
            }
         }
       }
@@ -546,7 +477,6 @@ static void TAG(quadr)( GLcontext *ctx,
    }
 
    if (DO_FLAT) {
-      if (HAVE_RGBA) {
         VERT_SAVE_RGBA( 0 );
         VERT_SAVE_RGBA( 1 );
         VERT_SAVE_RGBA( 2 );
@@ -561,15 +491,6 @@ static void TAG(quadr)( GLcontext *ctx,
            VERT_COPY_SPEC( v[1], v[3] );
            VERT_COPY_SPEC( v[2], v[3] );
         }
-      }
-      else {
-        VERT_SAVE_IND( 0 );
-        VERT_SAVE_IND( 1 );
-        VERT_SAVE_IND( 2 );
-        VERT_COPY_IND( v[0], v[3] );
-        VERT_COPY_IND( v[1], v[3] );
-        VERT_COPY_IND( v[2], v[3] );
-      }
    }
 
    if (mode == GL_POINT) {
@@ -625,37 +546,25 @@ static void TAG(quadr)( GLcontext *ctx,
       VERT_SET_Z(v[3], z[3]);
    }
 
-   if (DO_TWOSIDE && facing == 1)
-   {
-      if (HAVE_RGBA) {
-        if (!DO_FLAT) {
-           VERT_RESTORE_RGBA( 0 );
-           VERT_RESTORE_RGBA( 1 );
-           VERT_RESTORE_RGBA( 2 );
-        }
-        VERT_RESTORE_RGBA( 3 );
-        if (HAVE_SPEC) {
-           if (!DO_FLAT) {
-              VERT_RESTORE_SPEC( 0 );
-              VERT_RESTORE_SPEC( 1 );
-              VERT_RESTORE_SPEC( 2 );
-           }
-           VERT_RESTORE_SPEC( 3 );
-        }
+   if (DO_TWOSIDE && facing == 1) {
+      if (!DO_FLAT) {
+        VERT_RESTORE_RGBA( 0 );
+        VERT_RESTORE_RGBA( 1 );
+        VERT_RESTORE_RGBA( 2 );
       }
-      else {
+      VERT_RESTORE_RGBA( 3 );
+      if (HAVE_SPEC) {
         if (!DO_FLAT) {
-           VERT_RESTORE_IND( 0 );
-           VERT_RESTORE_IND( 1 );
-           VERT_RESTORE_IND( 2 );
+           VERT_RESTORE_SPEC( 0 );
+           VERT_RESTORE_SPEC( 1 );
+           VERT_RESTORE_SPEC( 2 );
         }
-        VERT_RESTORE_IND( 3 );
+        VERT_RESTORE_SPEC( 3 );
       }
    }
 
 
    if (DO_FLAT) {
-      if (HAVE_RGBA) {
         VERT_RESTORE_RGBA( 0 );
         VERT_RESTORE_RGBA( 1 );
         VERT_RESTORE_RGBA( 2 );
@@ -664,16 +573,10 @@ static void TAG(quadr)( GLcontext *ctx,
            VERT_RESTORE_SPEC( 1 );
            VERT_RESTORE_SPEC( 2 );
         }
-      }
-      else {
-        VERT_RESTORE_IND( 0 );
-        VERT_RESTORE_IND( 1 );
-        VERT_RESTORE_IND( 2 );
-      }
    }
 }
 #else
-static void TAG(quadr)( GLcontext *ctx, GLuint e0,
+static void TAG(quadr)( struct gl_context *ctx, GLuint e0,
                       GLuint e1, GLuint e2, GLuint e3 )
 {
    if (DO_UNFILLED) {
@@ -695,7 +598,7 @@ static void TAG(quadr)( GLcontext *ctx, GLuint e0,
 #endif
 
 #if DO_LINE
-static void TAG(line)( GLcontext *ctx, GLuint e0, GLuint e1 )
+static void TAG(line)( struct gl_context *ctx, GLuint e0, GLuint e1 )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
    VERTEX *v[2];
@@ -705,39 +608,28 @@ static void TAG(line)( GLcontext *ctx, GLuint e0, GLuint e1 )
    v[1] = (VERTEX *)GET_VERTEX(e1);
 
    if (DO_FLAT) {
-      if (HAVE_RGBA) {
         VERT_SAVE_RGBA( 0 );
         VERT_COPY_RGBA( v[0], v[1] );
         if (HAVE_SPEC && VB->AttribPtr[_TNL_ATTRIB_COLOR1]) {
            VERT_SAVE_SPEC( 0 );
            VERT_COPY_SPEC( v[0], v[1] );
         }
-      }
-      else {
-        VERT_SAVE_IND( 0 );
-        VERT_COPY_IND( v[0], v[1] );
-      }
    }
 
    LINE( v[0], v[1] );
 
    if (DO_FLAT) {
-      if (HAVE_RGBA) {
         VERT_RESTORE_RGBA( 0 );
 
         if (HAVE_SPEC && VB->AttribPtr[_TNL_ATTRIB_COLOR1]) {
            VERT_RESTORE_SPEC( 0 );
         }
-      }
-      else {
-        VERT_RESTORE_IND( 0 );
-      }
    }
 }
 #endif
 
 #if DO_POINTS
-static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last )
+static void TAG(points)( struct gl_context *ctx, GLuint first, GLuint last )
 {
    struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb;
    GLuint i;
@@ -781,23 +673,9 @@ static void TAG(init)( void )
 #undef IND
 #undef TAG
 
-#if HAVE_RGBA
-#undef VERT_SET_IND
-#undef VERT_COPY_IND
-#undef VERT_SAVE_IND
-#undef VERT_RESTORE_IND
 #if HAVE_BACK_COLORS
 #undef VERT_SET_RGBA
 #endif
-#else
-#undef VERT_SET_RGBA
-#undef VERT_COPY_RGBA
-#undef VERT_SAVE_RGBA
-#undef VERT_RESTORE_RGBA
-#if HAVE_BACK_COLORS
-#undef VERT_SET_IND
-#endif
-#endif
 
 #if !HAVE_SPEC
 #undef VERT_SET_SPEC
@@ -815,7 +693,6 @@ static void TAG(init)( void )
 
 #if !HAVE_BACK_COLORS
 #undef VERT_COPY_SPEC1
-#undef VERT_COPY_IND1
 #undef VERT_COPY_RGBA1
 #endif