swrast: s/Data/Map/ in swrast_texture_image

[mesa.git] / src / mesa / tnl_dd / t_dd_unfilled.h

diff --git a/src/mesa/tnl_dd/t_dd_unfilled.h b/src/mesa/tnl_dd/t_dd_unfilled.h
index e4d82aa080529d275139a632703335fd779fac0a..9856a36d6fbed9d376298b4db488dd342598b26b 100644 (file)
--- a/src/mesa/tnl_dd/t_dd_unfilled.h
+++ b/src/mesa/tnl_dd/t_dd_unfilled.h
@@ -25,13 +25,6 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#if HAVE_RGBA
-#define VERT_SET_IND( v, c )
-#define VERT_COPY_IND( v0, v1 )
-#define VERT_SAVE_IND( idx )
-#define VERT_RESTORE_IND( idx )
-#endif
-
 #if !HAVE_SPEC
 #define VERT_SET_SPEC( v, c )
 #define VERT_COPY_SPEC( v0, v1 )
@@ -39,7 +32,7 @@
 #define VERT_RESTORE_SPEC( idx )
 #endif
 
-static void TAG(unfilled_tri)( GLcontext *ctx,
+static void TAG(unfilled_tri)( struct gl_context *ctx,
                               GLenum mode,
                               GLuint e0, GLuint e1, GLuint e2 )
 {
@@ -53,23 +46,16 @@ static void TAG(unfilled_tri)( GLcontext *ctx,
    v[2] = (VERTEX *)GET_VERTEX(e2);
 
    if (ctx->Light.ShadeModel == GL_FLAT && HAVE_HW_FLATSHADE) {
-      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) {
-           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) {
+        VERT_SAVE_SPEC(0);
+        VERT_SAVE_SPEC(1);
+        VERT_COPY_SPEC(v[0], v[2]);
+        VERT_COPY_SPEC(v[1], v[2]);
       }
    }
 
@@ -98,23 +84,18 @@ static void TAG(unfilled_tri)( GLcontext *ctx,
    }
 
    if (ctx->Light.ShadeModel == GL_FLAT && HAVE_HW_FLATSHADE) {
-      if (HAVE_RGBA) {
-        VERT_RESTORE_RGBA(0);
-        VERT_RESTORE_RGBA(1);
-
-        if (HAVE_SPEC) {
-           VERT_RESTORE_SPEC(0);
-           VERT_RESTORE_SPEC(1);
-        }
-      } else {
-        VERT_RESTORE_IND(0);
-        VERT_RESTORE_IND(1);
+      VERT_RESTORE_RGBA(0);
+      VERT_RESTORE_RGBA(1);
+
+      if (HAVE_SPEC) {
+        VERT_RESTORE_SPEC(0);
+        VERT_RESTORE_SPEC(1);
       }
    }
 }
 
 
-static void TAG(unfilled_quad)( GLcontext *ctx,
+static void TAG(unfilled_quad)( struct gl_context *ctx,
                                GLenum mode,
                                GLuint e0, GLuint e1,
                                GLuint e2, GLuint e3 )
@@ -133,29 +114,20 @@ static void TAG(unfilled_quad)( GLcontext *ctx,
     * support flatshading, this will already have been done:
     */
    if (ctx->Light.ShadeModel == GL_FLAT && HAVE_HW_FLATSHADE) {
-      if (HAVE_RGBA) {
-        VERT_SAVE_RGBA(0);
-        VERT_SAVE_RGBA(1);
-        VERT_SAVE_RGBA(2);
-        VERT_COPY_RGBA(v[0], v[3]);
-        VERT_COPY_RGBA(v[1], v[3]);
-        VERT_COPY_RGBA(v[2], v[3]);
-
-        if (HAVE_SPEC) {
-           VERT_SAVE_SPEC(0);
-           VERT_SAVE_SPEC(1);
-           VERT_SAVE_SPEC(2);
-           VERT_COPY_SPEC(v[0], v[3]);
-           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]);
+      VERT_SAVE_RGBA(0);
+      VERT_SAVE_RGBA(1);
+      VERT_SAVE_RGBA(2);
+      VERT_COPY_RGBA(v[0], v[3]);
+      VERT_COPY_RGBA(v[1], v[3]);
+      VERT_COPY_RGBA(v[2], v[3]);
+
+      if (HAVE_SPEC) {
+        VERT_SAVE_SPEC(0);
+        VERT_SAVE_SPEC(1);
+        VERT_SAVE_SPEC(2);
+        VERT_COPY_SPEC(v[0], v[3]);
+        VERT_COPY_SPEC(v[1], v[3]);
+        VERT_COPY_SPEC(v[2], v[3]);
       }
    }
 
@@ -175,32 +147,19 @@ static void TAG(unfilled_quad)( GLcontext *ctx,
    }
 
    if (ctx->Light.ShadeModel == GL_FLAT && HAVE_HW_FLATSHADE) {
-      if (HAVE_RGBA) {
-        VERT_RESTORE_RGBA(0);
-        VERT_RESTORE_RGBA(1);
-        VERT_RESTORE_RGBA(2);
-
-        if (HAVE_SPEC) {
-           VERT_RESTORE_SPEC(0);
-           VERT_RESTORE_SPEC(1);
-           VERT_RESTORE_SPEC(2);
-        }
-      } else {
-        VERT_RESTORE_IND(0);
-        VERT_RESTORE_IND(1);
-        VERT_RESTORE_IND(2);
+      VERT_RESTORE_RGBA(0);
+      VERT_RESTORE_RGBA(1);
+      VERT_RESTORE_RGBA(2);
+
+      if (HAVE_SPEC) {
+        VERT_RESTORE_SPEC(0);
+        VERT_RESTORE_SPEC(1);
+        VERT_RESTORE_SPEC(2);
       }
    }
 }
 
 
-#if HAVE_RGBA
-#undef VERT_SET_IND
-#undef VERT_COPY_IND
-#undef VERT_SAVE_IND
-#undef VERT_RESTORE_IND
-#endif
-
 #if !HAVE_SPEC
 #undef VERT_SET_SPEC
 #undef VERT_COPY_SPEC