mesa: prefix more #includes with "main/"
[mesa.git] / src / mesa / drivers / x11 / xm_tri.c
index 8b5c39392a90e10c6928839d0c041a310dd2ee7f..3a0cf801397ea5efd9544e9b9d9f996282d4afdd 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  */
 
 
+#include "main/depth.h"
+#include "main/macros.h"
+#include "main/imports.h"
+#include "main/mtypes.h"
 #include "glxheader.h"
-#include "depth.h"
-#include "macros.h"
-#include "imports.h"
-#include "mtypes.h"
 #include "xmesaP.h"
 
 /* Internal swrast includes:
@@ -45,7 +45,7 @@
 
 
 #define GET_XRB(XRB)  struct xmesa_renderbuffer *XRB = \
-   (struct xmesa_renderbuffer *) ctx->DrawBuffer->_ColorDrawBuffers[0][0]
+   xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped)
 
 
 /**********************************************************************/
@@ -53,6 +53,8 @@
 /**********************************************************************/
 
 
+#if CHAN_BITS == 8
+
 /*
  * XImage, smooth, depth-buffered, PF_TRUECOLOR triangle.
  */
@@ -64,7 +66,7 @@
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);
 
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++, x++) {                       \
@@ -80,7 +82,7 @@
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 
 #include "swrast/s_tritemp.h"
 
 #define INTERP_Z 1
 #define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
+#define INTERP_ALPHA 1
 #define PIXEL_ADDRESS(X,Y) PIXEL_ADDR4(xrb, X, Y)
 #define PIXEL_TYPE GLuint
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
       const DEPTH_TYPE z = FixedToDepth(span.z);               \
       if (z < zRow[i]) {                                       \
-         pRow[i] = PACK_8B8G8R(FixedToInt(span.red),           \
-            FixedToInt(span.green), FixedToInt(span.blue));    \
+         pRow[i] = PACK_8A8B8G8R(FixedToInt(span.red),         \
+            FixedToInt(span.green), FixedToInt(span.blue),     \
+            FixedToInt(span.alpha));                           \
          zRow[i] = z;                                          \
       }                                                                \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
+      span.alpha += span.alphaStep;                            \
       span.z += span.zStep;                                    \
-   }
+   } }
 
 #include "swrast/s_tritemp.h"
 
 #define INTERP_Z 1
 #define DEPTH_TYPE DEFAULT_SOFTWARE_DEPTH_TYPE
 #define INTERP_RGB 1
+#define INTERP_ALPHA 1
 #define PIXEL_ADDRESS(X,Y) PIXEL_ADDR4(xrb, X, Y)
 #define PIXEL_TYPE GLuint
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
 
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
       const DEPTH_TYPE z = FixedToDepth(span.z);               \
       if (z < zRow[i]) {                                       \
-         pRow[i] = PACK_8R8G8B(FixedToInt(span.red),           \
-            FixedToInt(span.green), FixedToInt(span.blue));    \
+         pRow[i] = PACK_8A8R8G8B(FixedToInt(span.red),         \
+            FixedToInt(span.green), FixedToInt(span.blue),     \
+            FixedToInt(span.alpha));                           \
          zRow[i] = z;                                          \
       }                                                                \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
+      span.alpha += span.alphaStep;                            \
       span.z += span.zStep;                                    \
-   }
+   } }
 
 #include "swrast/s_tritemp.h"
 
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
 
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
       const DEPTH_TYPE z = FixedToDepth(span.z);               \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 
 #include "swrast/s_tritemp.h"
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
       const DEPTH_TYPE z = FixedToDepth(span.z);               \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    for (i = 0; i < span.end; i++, x++) {                       \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
       const DEPTH_TYPE z = FixedToDepth(span.z);               \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    for (i = 0; i < span.end; i++, x++) {                       \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    XDITHER_SETUP(y);                                           \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    GET_XRB(xrb);                                               \
    XMesaImage *img = xrb->ximage;
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    XDITHER_SETUP(y);                                           \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    LOOKUP_SETUP;                                               \
    for (i = 0; i < span.end; i++) {                            \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    for (i = 0; i < span.end; i++, x++) {                       \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    XMesaImage *img = xrb->ximage;                              \
    unsigned long pixel;                                                \
    PACK_TRUECOLOR(pixel, v2->color[0], v2->color[1], v2->color[2]);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    for (i = 0; i < span.end; i++, x++) {                       \
          zRow[i] = z;                                          \
       }                                                                \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                     \
    GET_XRB(xrb);                                       \
-   GLuint p = PACK_8B8G8R( v2->color[0], v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                            \
+   GLuint p = PACK_8A8B8G8R( v2->color[0], v2->color[1],\
+                             v2->color[2], v2->color[3]);
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       const DEPTH_TYPE z = FixedToDepth(span.z);       \
          zRow[i] = z;                                  \
       }                                                        \
       span.z += span.zStep;                            \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                     \
    GET_XRB(xrb);                                       \
-   GLuint p = PACK_8R8G8B( v2->color[0], v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                            \
+   GLuint p = PACK_8A8R8G8B(v2->color[0], v2->color[1],        \
+                            v2->color[2], v2->color[3]);
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       const DEPTH_TYPE z = FixedToDepth(span.z);       \
          zRow[i] = z;                                  \
       }                                                        \
       span.z += span.zStep;                            \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                     \
    GET_XRB(xrb);                                       \
    GLuint p = PACK_8R8G8B( v2->color[0], v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                    \
+#define RENDER_SPAN( span ) {                  \
    GLuint i;                                   \
    for (i = 0; i < span.end; i++) {            \
       DEPTH_TYPE z = FixedToDepth(span.z);     \
       if (z < zRow[i]) {                       \
         pRow[i] = (PIXEL_TYPE) p;              \
          zRow[i] = z;                          \
-         if (span.y == 100) printf("pass\n");\
       }                                                \
-      else   if (span.y == 100) printf("fail\n");\
       span.z += span.zStep;                    \
-   }
+   } }
 
 #include "swrast/s_tritemp.h"
 
 #define SETUP_CODE                                     \
    GET_XRB(xrb);                                       \
    const GLubyte *color = v2->color;
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       const DEPTH_TYPE z = FixedToDepth(span.z);       \
          zRow[i] = z;                                  \
       }                                                        \
       span.z += span.zStep;                            \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);                                               \
    XMesaImage *img = xrb->ximage;
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    for (i = 0; i < span.end; i++, x++) {                       \
          zRow[i] = z;                                          \
       }                                                                \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                     \
    GET_XRB(xrb);                                       \
    GLushort p = PACK_5R6G5B( v2->color[0], v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       const DEPTH_TYPE z = FixedToDepth(span.z);       \
          zRow[i] = z;                                  \
       }                                                        \
       span.z += span.zStep;                            \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);                                               \
    const GLubyte *color = v2->color;
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    for (i = 0; i < span.end; i++, x++) {                       \
          zRow[i] = z;                                          \
       }                                                                \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    GET_XRB(xrb);                                               \
    FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);                   \
    FLAT_DITHER_ROW_SETUP(YFLIP(xrb, y));                       \
          zRow[i] = z;                                          \
       }                                                                \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GET_XRB(xrb);                                       \
    XMesaImage *img = xrb->ximage;              \
    FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    FLAT_DITHER_ROW_SETUP(y);                                   \
          zRow[i] = z;                                          \
       }                                                                \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GLubyte r = v2->color[0];                                   \
    GLubyte g = v2->color[1];                                   \
    GLubyte b = v2->color[2];
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
          zRow[i] = z;                                          \
       }                                                                \
       span.z += span.zStep;                                    \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GLubyte g = v2->color[1];                           \
    GLubyte b = v2->color[2];                           \
    GLubyte p = LOOKUP(r,g,b);
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       const DEPTH_TYPE z = FixedToDepth(span.z);       \
          zRow[i] = z;                                  \
       }                                                        \
       span.z += span.zStep;                            \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);                                               \
    XMesaImage *img = xrb->ximage;
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
  */
 #define NAME smooth_8A8B8G8R_triangle
 #define INTERP_RGB 1
+#define INTERP_ALPHA 1
 #define PIXEL_ADDRESS(X,Y) PIXEL_ADDR4(xrb, X, Y)
 #define PIXEL_TYPE GLuint
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
-      pRow[i] = PACK_8B8G8R(FixedToInt(span.red),              \
-         FixedToInt(span.green), FixedToInt(span.blue) );      \
+      pRow[i] = PACK_8A8B8G8R(FixedToInt(span.red),            \
+         FixedToInt(span.green), FixedToInt(span.blue),                \
+         FixedToInt(span.alpha));                              \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+      span.alpha += span.alphaStep;                            \
+   } }
 #include "swrast/s_tritemp.h"
 
 
  */
 #define NAME smooth_8A8R8G8B_triangle
 #define INTERP_RGB 1
+#define INTERP_ALPHA 1
 #define PIXEL_ADDRESS(X,Y) PIXEL_ADDR4(xrb, X, Y)
 #define PIXEL_TYPE GLuint
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
-      pRow[i] = PACK_8R8G8B(FixedToInt(span.red),              \
-         FixedToInt(span.green), FixedToInt(span.blue) );      \
+      pRow[i] = PACK_8A8R8G8B(FixedToInt(span.red),            \
+         FixedToInt(span.green), FixedToInt(span.blue),                \
+         FixedToInt(span.alpha));                              \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+      span.alpha += span.alphaStep;                            \
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
       pRow[i] = PACK_8R8G8B(FixedToInt(span.red),              \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                     \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    PIXEL_TYPE *pixel = pRow;                           \
    for (i = 0; i < span.end; i++, pixel++) {           \
       span.red += span.redStep;                                \
       span.green += span.greenStep;                    \
       span.blue += span.blueStep;                      \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);                                               \
    XMesaImage *img = xrb->ximage;
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    for (i = 0; i < span.end; i++) {                            \
       pRow[i] = (PIXEL_TYPE) PACK_5R6G5B(FixedToInt(span.red), \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    XDITHER_SETUP(y);                                           \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    GET_XRB(xrb);                                               \
    XMesaImage *img = xrb->ximage;
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    XDITHER_SETUP(y);                                           \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define BYTES_PER_ROW (xrb->ximage->bytes_per_line)
 #define SETUP_CODE                                             \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    LOOKUP_SETUP;                                               \
    for (i = 0; i < span.end; i++) {                            \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
       span.red += span.redStep;                                        \
       span.green += span.greenStep;                            \
       span.blue += span.blueStep;                              \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    XMesaImage *img = xrb->ximage;                              \
    unsigned long pixel;                                                \
    PACK_TRUECOLOR(pixel, v2->color[0], v2->color[1], v2->color[2]);
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
       XMesaPutPixel(img, x, y, pixel);                         \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GET_XRB(xrb);                                       \
    unsigned long p = PACK_8B8G8R( v2->color[0],                \
                 v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       pRow[i] = (PIXEL_TYPE) p;                                \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GET_XRB(xrb);                                       \
    unsigned long p = PACK_8R8G8B( v2->color[0],                \
                 v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       pRow[i] = (PIXEL_TYPE) p;                                \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GET_XRB(xrb);                                       \
    unsigned long p = PACK_8R8G8B( v2->color[0],                \
                 v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       pRow[i] = (PIXEL_TYPE) p;                                \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                     \
    GET_XRB(xrb);                                       \
    const GLubyte *color = v2->color;
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    PIXEL_TYPE *pixel = pRow;                           \
    for (i = 0; i < span.end; i++, pixel++) {           \
       pixel->r = color[RCOMP];                         \
       pixel->g = color[GCOMP];                         \
       pixel->b = color[BCOMP];                         \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);                                               \
    XMesaImage *img = xrb->ximage;
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
       PACK_TRUEDITHER(p, x, y, v2->color[0],                   \
                v2->color[1], v2->color[2] );                   \
       XMesaPutPixel(img, x, y, p);                             \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GET_XRB(xrb);                                       \
    unsigned long p = PACK_5R6G5B( v2->color[0],                \
                 v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       pRow[i] = (PIXEL_TYPE) p;                                \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    XMesaContext xmesa = XMESA_CONTEXT(ctx);                    \
    GET_XRB(xrb);                                               \
    const GLubyte *color = v2->color;
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
       PACK_TRUEDITHER(pRow[i], x, y, color[RCOMP],             \
          color[GCOMP], color[BCOMP]);                          \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
 #define SETUP_CODE                                             \
    GET_XRB(xrb);                                               \
    FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    FLAT_DITHER_ROW_SETUP(YFLIP(xrb, y));               \
    for (i = 0; i < span.end; i++, x++) {                       \
       pRow[i] = (PIXEL_TYPE) FLAT_DITHER(x);                   \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GET_XRB(xrb);                                               \
    XMesaImage *img = xrb->ximage;                              \
    FLAT_DITHER_SETUP( v2->color[0], v2->color[1], v2->color[2] );
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    FLAT_DITHER_ROW_SETUP(y);                                   \
    for (i = 0; i < span.end; i++, x++) {                       \
       unsigned long p = FLAT_DITHER(x);                                \
       XMesaPutPixel(img, x, y, p );                            \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GLubyte r = v2->color[0];                                   \
    GLubyte g = v2->color[1];                                   \
    GLubyte b = v2->color[2];
-#define RENDER_SPAN( span )                                    \
+#define RENDER_SPAN( span ) {                                  \
    GLuint i;                                                   \
    GLint x = span.x, y = YFLIP(xrb, span.y);   \
    for (i = 0; i < span.end; i++, x++) {                       \
       pRow[i] = (PIXEL_TYPE) DITHER_HPCR(x, y, r, g, b);       \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
    GLubyte g = v2->color[1];                           \
    GLubyte b = v2->color[2];                           \
    GLubyte p = LOOKUP(r,g,b);
-#define RENDER_SPAN( span )                            \
+#define RENDER_SPAN( span ) {                          \
    GLuint i;                                           \
    for (i = 0; i < span.end; i++) {                    \
       pRow[i] = (PIXEL_TYPE) p;                                \
-   }
+   } }
 #include "swrast/s_tritemp.h"
 
 
+#endif /* CHAN_BITS == 8 */
 
-#ifdef DEBUG
+
+#if defined(DEBUG) && CHAN_BITS == 8
 extern void _xmesa_print_triangle_func( swrast_tri_func triFunc );
 void _xmesa_print_triangle_func( swrast_tri_func triFunc )
 {
@@ -1427,29 +1443,43 @@ do {                                   \
 #endif
 
 
-static swrast_tri_func get_triangle_func( GLcontext *ctx )
+/**
+ * Return pointer to line drawing function, or NULL if we should use a
+ * swrast fallback.
+ */
+static swrast_tri_func
+get_triangle_func(GLcontext *ctx)
 {
+#if CHAN_BITS == 8
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
    XMesaContext xmesa = XMESA_CONTEXT(ctx);
-   int depth = GET_VISUAL_DEPTH(xmesa->xm_visual);
-   struct xmesa_renderbuffer *xrb = (struct xmesa_renderbuffer *)
-      ctx->DrawBuffer->_ColorDrawBuffers[0][0];
+   XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
+   const int depth = GET_VISUAL_DEPTH(xmesa->xm_visual);
+   const struct xmesa_renderbuffer *xrb;
 
-   return NULL;
 #ifdef DEBUG
    triFuncName = NULL;
 #endif
 
-   if ((ctx->DrawBuffer->_ColorDrawBufferMask[0]
-        & (BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT)) == 0)
+   /* trivial fallback tests */
+   if ((ctx->DrawBuffer->_ColorDrawBufferIndexes[0] != BUFFER_BIT_FRONT_LEFT) &&
+       (ctx->DrawBuffer->_ColorDrawBufferIndexes[0] != BUFFER_BIT_BACK_LEFT))
+      return (swrast_tri_func) NULL;
+   if (ctx->RenderMode != GL_RENDER)
+      return (swrast_tri_func) NULL;
+   if (ctx->Polygon.SmoothFlag)
+      return (swrast_tri_func) NULL;
+   if (ctx->Texture._EnabledUnits)
+      return (swrast_tri_func) NULL;
+   if (swrast->_RasterMask & MULTI_DRAW_BIT)
       return (swrast_tri_func) NULL;
-   if (ctx->RenderMode != GL_RENDER)  return (swrast_tri_func) NULL;
-   if (ctx->Polygon.SmoothFlag)       return (swrast_tri_func) NULL;
-   if (ctx->Texture._EnabledUnits)    return (swrast_tri_func) NULL;
-   if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_tri_func) NULL;
    if (ctx->Polygon.CullFlag && 
        ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
-                                        return (swrast_tri_func) NULL;
+      return (swrast_tri_func) NULL;
+   if (xmbuf->swAlpha)
+      return (swrast_tri_func) NULL;
+
+   xrb = xmesa_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]->Wrapped);
 
    if (xrb->ximage) {
       if (   ctx->Light.ShadeModel==GL_SMOOTH
@@ -1603,13 +1633,10 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
                return (swrast_tri_func) NULL;
          }
       }
-
-      return (swrast_tri_func) NULL;
-   }
-   else {
-      /* draw to pixmap */
-      return (swrast_tri_func) NULL;
    }
+#endif /* CHAN_BITS == 8 */
+
+   return (swrast_tri_func) NULL;
 }