doc updates; GLUT timer additions; fixed compilation warnings
[mesa.git] / src / mesa / drivers / glide / fxddspan.c
index 21b48ae789b7c7fe895a16b2848920dd56304df6..158e34e08e1650b6e08e6c794fe020be302c0727 100644 (file)
@@ -1,27 +1,40 @@
-/* -*- mode: C; tab-width:8;  -*-
-
-             fxdd.c - 3Dfx VooDoo Mesa span and pixel functions
-*/
-
 /*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * Mesa 3-D graphics library
+ * Version:  4.0
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * See the file fxapi.c for more informations about authors
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
  *
+ * 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.
  */
 
+/* Authors:
+ *    David Bucciarelli
+ *    Brian Paul
+ *    Daryll Strauss
+ *    Keith Whitwell
+ *    Daniel Borca
+ *    Hiroshi Morii
+ */
+
+
+/* fxdd.c - 3Dfx VooDoo Mesa span and pixel functions */
+
+
 #ifdef HAVE_CONFIG_H
 #include "conf.h"
 #endif
 #if defined(FX)
 
 #include "fxdrv.h"
+#include "fxglidew.h"
+#include "swrast/swrast.h"
 
-#ifdef _MSC_VER
-#ifdef _WIN32
-#pragma warning( disable : 4090 4022 )
-/* 4101 : "different 'const' qualifier"
- * 4022 : "pointer mistmatch for actual parameter 'n'
- */
-#endif
-#endif
 
+/************************************************************************/
+/*****                    Span functions                            *****/
+/************************************************************************/
+
+#define DBG 0
+
+
+#define LOCAL_VARS                                                     \
+    GLuint pitch = info.strideInBytes;                                 \
+    GLuint height = fxMesa->height;                                    \
+    char *buf = (char *)((char *)info.lfbPtr + 0 /* x, y offset */);   \
+    GLuint p;                                                          \
+    (void) buf; (void) p;
+
+#define CLIPPIXEL( _x, _y )    ( _x >= minx && _x < maxx &&            \
+                                 _y >= miny && _y < maxy )
+
+#define CLIPSPAN( _x, _y, _n, _x1, _n1, _i )                           \
+    if ( _y < miny || _y >= maxy ) {                                   \
+       _n1 = 0, _x1 = x;                                               \
+    } else {                                                           \
+       _n1 = _n;                                                       \
+       _x1 = _x;                                                       \
+       if ( _x1 < minx ) _i += (minx-_x1), n1 -= (minx-_x1), _x1 = minx;\
+       if ( _x1 + _n1 >= maxx ) n1 -= (_x1 + n1 - maxx);               \
+    }
+
+#define Y_FLIP(_y)             (height - _y - 1)
+
+#define HW_WRITE_LOCK()                                                        \
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);                            \
+    GrLfbInfo_t info;                                                  \
+    info.size = sizeof(GrLfbInfo_t);                                   \
+    if ( grLfbLock( GR_LFB_WRITE_ONLY,                                 \
+                   fxMesa->currentFB, LFB_MODE,                                \
+                  GR_ORIGIN_UPPER_LEFT, FXFALSE, &info ) ) {
+
+#define HW_WRITE_UNLOCK()                                              \
+       grLfbUnlock( GR_LFB_WRITE_ONLY, fxMesa->currentFB );            \
+    }
 
-#if !defined(FXMESA_USE_ARGB) 
+#define HW_READ_LOCK()                                                 \
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);                            \
+    GrLfbInfo_t info;                                                  \
+    info.size = sizeof(GrLfbInfo_t);                                   \
+    if ( grLfbLock( GR_LFB_READ_ONLY, fxMesa->currentFB,               \
+                    LFB_MODE, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info ) ) {
 
-/* KW: Rearranged the args in the call to grLfbWriteRegion().
+#define HW_READ_UNLOCK()                                               \
+       grLfbUnlock( GR_LFB_READ_ONLY, fxMesa->currentFB );             \
+    }
+
+#define HW_WRITE_CLIPLOOP()                                            \
+    do {                                                               \
+       int _nc = 1; /* numcliprects */                                 \
+       /* [dBorca] Hack alert: */                                      \
+       /* remember, we need to flip the scissor, too */                \
+       /* is it better to do it inside fxDDScissor? */                 \
+       while (_nc--) {                                                 \
+           const int minx = fxMesa->clipMinX;                          \
+           const int maxy = Y_FLIP(fxMesa->clipMinY);                  \
+           const int maxx = fxMesa->clipMaxX;                          \
+           const int miny = Y_FLIP(fxMesa->clipMaxY);
+
+#define HW_READ_CLIPLOOP()                                             \
+    do {                                                               \
+       int _nc = 1; /* numcliprects */                                 \
+       /* [dBorca] Hack alert: */                                      \
+       /* remember, we need to flip the scissor, too */                \
+       /* is it better to do it inside fxDDScissor? */                 \
+       while (_nc--) {                                                 \
+           const int minx = fxMesa->clipMinX;                          \
+           const int maxy = Y_FLIP(fxMesa->clipMinY);                  \
+           const int maxx = fxMesa->clipMaxX;                          \
+           const int miny = Y_FLIP(fxMesa->clipMaxY);
+
+#define HW_ENDCLIPLOOP()                                               \
+       }                                                               \
+    } while (0)
+
+
+/* 16 bit, ARGB1555 color spanline and pixel functions */
+
+#undef LFB_MODE
+#define LFB_MODE       GR_LFBWRITEMODE_1555
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 2
+
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p, color) \
+    p = TDFXPACKCOLOR1555( color[RCOMP], color[GCOMP], color[BCOMP], color[ACOMP] )
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )                               \
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) =                 \
+                                       TDFXPACKCOLOR1555( r, g, b, a )
+
+#define WRITE_PIXEL( _x, _y, p )                                       \
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) = p
+
+#define READ_RGBA( rgba, _x, _y )                                      \
+    do {                                                               \
+       GLushort p = *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch);  \
+       rgba[0] = FX_rgb_scale_5[(p >> 10) & 0x1F];                     \
+       rgba[1] = FX_rgb_scale_5[(p >> 5)  & 0x1F];                     \
+       rgba[2] = FX_rgb_scale_5[ p        & 0x1F];                     \
+       rgba[3] = (p & 0x8000) ? 255 : 0;                               \
+    } while (0)
+
+#define TAG(x) tdfx##x##_ARGB1555
+#include "../dri/common/spantmp.h"
+
+
+/* 16 bit, RGB565 color spanline and pixel functions */
+/* [dBorca] Hack alert:
+ * This is wrong. The alpha value is lost, even when we provide
+ * HW alpha (565 w/o depth buffering). To really update alpha buffer,
+ * we would need to do the 565 writings via 8888 colorformat and rely
+ * on the Voodoo to perform color scaling. In which case our 565 span
+ * would look nicer! But this violates FSAA rules...
  */
-#define LFB_WRITE_SPAN_MESA(dst_buffer,                \
-                           dst_x,              \
-                           dst_y,              \
-                           src_width,          \
-                           src_stride,         \
-                           src_data)           \
-  grLfbWriteRegion(dst_buffer,                 \
-                  dst_x,                       \
-                  dst_y,                       \
-                  GR_LFB_SRC_FMT_8888,         \
-                  src_width,                   \
-                  1,                           \
-                  src_stride,                  \
-                  src_data)                    \
-
-
-#else /* defined(FXMESA_USE_RGBA) */
-
-#define MESACOLOR_TO_ARGB(c) (                         \
-             ( ((unsigned int)(c[ACOMP]))<<24 ) |      \
-             ( ((unsigned int)(c[RCOMP]))<<16 ) |      \
-             ( ((unsigned int)(c[GCOMP]))<<8 )  |      \
-             (  (unsigned int)(c[BCOMP])) )
-  
-void LFB_WRITE_SPAN_MESA(GrBuffer_t dst_buffer, 
-                        FxU32 dst_x, 
-                        FxU32 dst_y, 
-                        FxU32 src_width,
-                        FxI32 src_stride, 
-                        void *src_data )
-{
-   /* Covert to ARGB */
-   GLubyte (*rgba)[4] = src_data;
-   GLuint argb[MAX_WIDTH];
-   int i;
-   
-   for (i = 0; i < src_width; i++)
-   {
-      argb[i] = MESACOLOR_TO_ARGB(rgba[i]);
-   }
-   FX_grLfbWriteRegion(dst_buffer,
-                      dst_x,
-                      dst_y,
-                      GR_LFB_SRC_FMT_8888,
-                      src_width,
-                      1,
-                      src_stride,
-                      (void*)argb);
-}
 
-#endif
+#undef LFB_MODE
+#define LFB_MODE       GR_LFBWRITEMODE_565
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 2
+
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p, color) \
+    p = TDFXPACKCOLOR565( color[RCOMP], color[GCOMP], color[BCOMP] )
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )                               \
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) =                 \
+                                       TDFXPACKCOLOR565( r, g, b )
+
+#define WRITE_PIXEL( _x, _y, p )                                       \
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) = p
+
+#define READ_RGBA( rgba, _x, _y )                                      \
+    do {                                                               \
+       GLushort p = *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch);  \
+       rgba[0] = FX_rgb_scale_5[(p >> 11) & 0x1F];                     \
+       rgba[1] = FX_rgb_scale_6[(p >> 5)  & 0x3F];                     \
+       rgba[2] = FX_rgb_scale_5[ p        & 0x1F];                     \
+       rgba[3] = 0xff;                                                 \
+    } while (0)
+
+#define TAG(x) tdfx##x##_RGB565
+#include "../dri/common/spantmp.h"
+
+
+/* 32 bit, ARGB8888 color spanline and pixel functions */
+
+#undef LFB_MODE
+#define LFB_MODE       GR_LFBWRITEMODE_8888
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 4
+
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p, color) \
+    p = TDFXPACKCOLOR8888( color[RCOMP], color[GCOMP], color[BCOMP], color[ACOMP] )
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )                               \
+    *(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch) =                   \
+                                       TDFXPACKCOLOR8888( r, g, b, a )
+
+#define WRITE_PIXEL( _x, _y, p )                                       \
+    *(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch) = p
+
+#define READ_RGBA( rgba, _x, _y )                                      \
+    do {                                                               \
+       GLuint p = *(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch);      \
+        rgba[0] = (p >> 16) & 0xff;                                    \
+        rgba[1] = (p >>  8) & 0xff;                                    \
+        rgba[2] = (p >>  0) & 0xff;                                    \
+        rgba[3] = (p >> 24) & 0xff;                                    \
+    } while (0)
+
+#define TAG(x) tdfx##x##_ARGB8888
+#include "../dri/common/spantmp.h"
+
 
 /************************************************************************/
-/*****                    Span functions                            *****/
+/*****                    Depth functions                           *****/
 /************************************************************************/
 
+#define DBG 0
 
-static void fxDDWriteRGBASpan(const GLcontext *ctx, 
-                              GLuint n, GLint x, GLint y,
-                              const GLubyte rgba[][4], const GLubyte mask[])
-{
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteRGBASpan(...)\n");
-  }
-
-  if (mask) {
-    int span=0;
-
-    for (i=0;i<n;i++) {
-      if (mask[i]) {
-        ++span; 
-      } else {
-        if (span > 0) {
-          LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x+i-span, bottom-y,
-                           /* GR_LFB_SRC_FMT_8888,*/ span, /*1,*/ 0, (void *) rgba[i-span] );
-          span = 0;
-        }
-      }
-    }
+#undef HW_WRITE_LOCK
+#undef HW_WRITE_UNLOCK
+#undef HW_READ_LOCK
+#undef HW_READ_UNLOCK
 
-    if (span > 0)
-      LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x+n-span, bottom-y,
-                        /* GR_LFB_SRC_FMT_8888, */ span, /*1,*/ 0, (void *) rgba[n-span] );
-  } else
-    LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x, bottom-y,/* GR_LFB_SRC_FMT_8888,*/
-                      n,/* 1,*/ 0, (void *) rgba );
-}
+#define HW_CLIPLOOP HW_WRITE_CLIPLOOP
 
+#define LOCAL_DEPTH_VARS                                               \
+    GLuint pitch = info.strideInBytes;                                 \
+    GLuint height = fxMesa->height;                                    \
+    char *buf = (char *)((char *)info.lfbPtr + 0 /* x, y offset */);   \
+    (void) buf;
 
-static void fxDDWriteRGBSpan(const GLcontext *ctx, 
-                             GLuint n, GLint x, GLint y,
-                             const GLubyte rgb[][3], const GLubyte mask[])
-{
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-  GLubyte rgba[MAX_WIDTH][4];
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteRGBSpan()\n");
-  }
-
-  if (mask) {
-    int span=0;
-
-    for (i=0;i<n;i++) {
-      if (mask[i]) {
-        rgba[span][RCOMP] = rgb[i][0];
-        rgba[span][GCOMP] = rgb[i][1];
-        rgba[span][BCOMP] = rgb[i][2];
-        rgba[span][ACOMP] = 255;
-        ++span;
-      } else {
-        if (span > 0) {
-          LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x+i-span, bottom-y,
-                            /*GR_LFB_SRC_FMT_8888,*/ span,/* 1,*/ 0, (void *) rgba );
-          span = 0;
-        }
-      }
+#define HW_WRITE_LOCK()                                                        \
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);                            \
+    GrLfbInfo_t info;                                                  \
+    info.size = sizeof(GrLfbInfo_t);                                   \
+    if ( grLfbLock( GR_LFB_WRITE_ONLY,                                 \
+                   GR_BUFFER_AUXBUFFER, LFB_MODE,                      \
+                  GR_ORIGIN_UPPER_LEFT, FXFALSE, &info ) ) {
+
+#define HW_WRITE_UNLOCK()                                              \
+       grLfbUnlock( GR_LFB_WRITE_ONLY, GR_BUFFER_AUXBUFFER);           \
     }
 
-    if (span > 0)
-      LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x+n-span, bottom-y,
-                        /*GR_LFB_SRC_FMT_8888,*/ span,/* 1,*/ 0, (void *) rgba );
-  } else {
-    for (i=0;i<n;i++) {
-      rgba[i][RCOMP]=rgb[i][0];
-      rgba[i][GCOMP]=rgb[i][1];
-      rgba[i][BCOMP]=rgb[i][2];
-      rgba[i][ACOMP]=255;
+#define HW_READ_LOCK()                                                 \
+    fxMesaContext fxMesa = FX_CONTEXT(ctx);                            \
+    GrLfbInfo_t info;                                                  \
+    info.size = sizeof(GrLfbInfo_t);                                   \
+    if ( grLfbLock( GR_LFB_READ_ONLY, GR_BUFFER_AUXBUFFER,             \
+                    LFB_MODE, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info ) ) {
+
+#define HW_READ_UNLOCK()                                               \
+       grLfbUnlock( GR_LFB_READ_ONLY, GR_BUFFER_AUXBUFFER);            \
     }
 
-    LFB_WRITE_SPAN_MESA( fxMesa->currentFB, x, bottom-y,/* GR_LFB_SRC_FMT_8888,*/
-                      n,/* 1,*/ 0, (void *) rgba );
-  }
-}
 
+/* 16 bit, depth spanline and pixel functions */
 
-static void fxDDWriteMonoRGBASpan(const GLcontext *ctx, 
-                                  GLuint n, GLint x, GLint y,
-                                  const GLubyte mask[])
-{
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-  GLuint data[MAX_WIDTH];
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteMonoRGBASpan(...)\n");
-  }
-
-  if (mask) {
-    int span=0;
-
-    for (i=0;i<n;i++) {
-      if (mask[i]) {
-        data[span] = (GLuint) fxMesa->color;
-        ++span;
-      } else {
-        if (span > 0) {
-          FX_grLfbWriteRegion( fxMesa->currentFB, x+i-span, bottom-y,
-                            GR_LFB_SRC_FMT_8888, span, 1, 0,
-                            (void *) data );
-          span = 0;
-        }
-      }
-    }
+#undef LFB_MODE
+#define LFB_MODE       GR_LFBWRITEMODE_ZA16
 
-    if (span > 0)
-      FX_grLfbWriteRegion( fxMesa->currentFB, x+n-span, bottom-y,
-                        GR_LFB_SRC_FMT_8888, span, 1, 0,
-                        (void *) data );
-  } else {
-    for (i=0;i<n;i++) {
-      data[i]=(GLuint) fxMesa->color;
-    }
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 2
 
-    FX_grLfbWriteRegion( fxMesa->currentFB, x, bottom-y, GR_LFB_SRC_FMT_8888,
-                      n, 1, 0, (void *) data );
-  }
-}
+#define WRITE_DEPTH( _x, _y, d )                                       \
+    *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch) = d
 
+#define READ_DEPTH( d, _x, _y )                                                \
+    d = *(GLushort *)(buf + _x*BYTESPERPIXEL + _y*pitch)
 
-static void fxDDReadRGBASpan(const GLcontext *ctx, 
-                             GLuint n, GLint x, GLint y, GLubyte rgba[][4])
-{
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLushort data[MAX_WIDTH];
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadRGBASpan(...)\n");
-  }
-
-  assert(n < MAX_WIDTH);
-
-  grLfbReadRegion( fxMesa->currentFB, x, bottom-y, n, 1, 0, data);
-  for (i=0;i<n;i++) {
-#if FXMESA_USE_ARGB
-    rgba[i][RCOMP]=(data[i] & 0xF800) >> 8;
-    rgba[i][GCOMP]=(data[i] & 0x07E0) >> 3;
-    rgba[i][BCOMP]=(data[i] & 0x001F) << 3;
-#else
-    rgba[i][RCOMP]=(data[i] & 0x001f) << 3;
-    rgba[i][GCOMP]=(data[i] & 0x07e0) >> 3;
-    rgba[i][BCOMP]=(data[i] & 0xf800) >> 8;
-#endif
-    rgba[i][ACOMP]=255;
-  }
+#define TAG(x) tdfx##x##_Z16
+#include "../dri/common/depthtmp.h"
 
-}
+
+/* 24 bit, depth spanline and pixel functions (for use w/ stencil) */
+/* [dBorca] Hack alert:
+ * This is evil. The incoming Mesa's 24bit depth value
+ * is shifted left 8 bits, to obtain a full 32bit value,
+ * which will be thrown into the framebuffer. We rely on
+ * the fact that Voodoo hardware transforms a 32bit value
+ * into 24bit value automatically and, MOST IMPORTANT, won't
+ * alter the upper 8bits of the value already existing in the
+ * framebuffer (where stencil resides).
+ */
+
+#undef LFB_MODE
+#define LFB_MODE       GR_LFBWRITEMODE_Z32
+
+#undef BYTESPERPIXEL
+#define BYTESPERPIXEL 4
+
+#define WRITE_DEPTH( _x, _y, d )                                       \
+    *(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch) = d << 8
+
+#define READ_DEPTH( d, _x, _y )                                                \
+    d = (*(GLuint *)(buf + _x*BYTESPERPIXEL + _y*pitch)) & 0xffffff
+
+#define TAG(x) tdfx##x##_Z24
+#include "../dri/common/depthtmp.h"
+
+
+/* 32 bit, depth spanline and pixel functions (for use w/o stencil) */
+/* [dBorca] Hack alert:
+ * This is more evil. We make Mesa run in 32bit depth, but
+ * tha Voodoo HW can only handle 24bit depth. Well, exploiting
+ * the pixel pipeline, we can achieve 24:8 format for greater
+ * precision...
+ * If anyone tells me how to really store 32bit values into the
+ * depth buffer, I'll write the *_Z32 routines. Howver, bear in
+ * mind that means running without stencil!
+ */
 
 /************************************************************************/
-/*****                    Pixel functions                           *****/
+/*****                    Span functions (optimized)                *****/
 /************************************************************************/
 
-static void fxDDWriteRGBAPixels(const GLcontext *ctx,
-                                GLuint n, const GLint x[], const GLint y[],
-                                CONST GLubyte rgba[][4], const GLubyte mask[])
+/*
+ * Read a span of 15-bit RGB pixels.  Note, we don't worry about cliprects
+ * since OpenGL says obscured pixels have undefined values.
+ */
+static void fxReadRGBASpan_ARGB1555 (const GLcontext * ctx,
+                                     GLuint n,
+                                     GLint x, GLint y,
+                                     GLubyte rgba[][4])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteRGBAPixels(...)\n");
-  }
-
-  for(i=0;i<n;i++)
-    if(mask[i])
-       LFB_WRITE_SPAN_MESA(fxMesa->currentFB,x[i],bottom-y[i],
-                       /*GR_LFB_SRC_FMT_8888,*/1,/*1,*/0,(void *)rgba[i]);
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+ GrLfbInfo_t info;
+ info.size = sizeof(GrLfbInfo_t);
+ if (grLfbLock(GR_LFB_READ_ONLY, fxMesa->currentFB,
+               GR_LFBWRITEMODE_ANY, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info)) {
+    const GLint winX = 0;
+    const GLint winY = fxMesa->height - 1;
+    const GLushort *data16 = (const GLushort *)((const GLubyte *)info.lfbPtr +
+                                               (winY - y) * info.strideInBytes +
+                                                (winX + x) * 2);
+    const GLuint *data32 = (const GLuint *) data16;
+    GLuint i, j;
+    GLuint extraPixel = (n & 1);
+    n -= extraPixel;
+
+    for (i = j = 0; i < n; i += 2, j++) {
+       GLuint pixel = data32[j];
+       rgba[i][0] = FX_rgb_scale_5[(pixel >> 10) & 0x1F];
+       rgba[i][1] = FX_rgb_scale_5[(pixel >> 5)  & 0x1F];
+       rgba[i][2] = FX_rgb_scale_5[ pixel        & 0x1F];
+       rgba[i][3] = (pixel & 0x8000) ? 255 : 0;
+       rgba[i+1][0] = FX_rgb_scale_5[(pixel >> 26) & 0x1F];
+       rgba[i+1][1] = FX_rgb_scale_5[(pixel >> 21) & 0x1F];
+       rgba[i+1][2] = FX_rgb_scale_5[(pixel >> 16) & 0x1F];
+       rgba[i+1][3] = (pixel & 0x80000000) ? 255 : 0;
+    }
+    if (extraPixel) {
+       GLushort pixel = data16[n];
+       rgba[n][0] = FX_rgb_scale_5[(pixel >> 10) & 0x1F];
+       rgba[n][1] = FX_rgb_scale_5[(pixel >> 5)  & 0x1F];
+       rgba[n][2] = FX_rgb_scale_5[ pixel        & 0x1F];
+       rgba[n][3] = (pixel & 0x8000) ? 255 : 0;
+    }
+
+    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+ }
 }
 
-static void fxDDWriteMonoRGBAPixels(const GLcontext *ctx,
-                                    GLuint n, const GLint x[], const GLint y[],
-                                    const GLubyte mask[])
+/*
+ * Read a span of 16-bit RGB pixels.  Note, we don't worry about cliprects
+ * since OpenGL says obscured pixels have undefined values.
+ */
+static void fxReadRGBASpan_RGB565 (const GLcontext * ctx,
+                                   GLuint n,
+                                   GLint x, GLint y,
+                                   GLubyte rgba[][4])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDWriteMonoRGBAPixels(...)\n");
-  }
-
-  for(i=0;i<n;i++)
-    if(mask[i])
-      FX_grLfbWriteRegion(fxMesa->currentFB,x[i],bottom-y[i],
-                       GR_LFB_SRC_FMT_8888,1,1,0,(void *) &fxMesa->color);
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+ GrLfbInfo_t info;
+ info.size = sizeof(GrLfbInfo_t);
+ if (grLfbLock(GR_LFB_READ_ONLY, fxMesa->currentFB,
+               GR_LFBWRITEMODE_ANY, GR_ORIGIN_UPPER_LEFT, FXFALSE, &info)) {
+    const GLint winX = 0;
+    const GLint winY = fxMesa->height - 1;
+    const GLushort *data16 = (const GLushort *)((const GLubyte *)info.lfbPtr +
+                                               (winY - y) * info.strideInBytes +
+                                                (winX + x) * 2);
+    const GLuint *data32 = (const GLuint *) data16;
+    GLuint i, j;
+    GLuint extraPixel = (n & 1);
+    n -= extraPixel;
+
+    for (i = j = 0; i < n; i += 2, j++) {
+        GLuint pixel = data32[j];
+       rgba[i][0] = FX_rgb_scale_5[(pixel >> 11) & 0x1F];
+       rgba[i][1] = FX_rgb_scale_6[(pixel >> 5)  & 0x3F];
+       rgba[i][2] = FX_rgb_scale_5[ pixel        & 0x1F];
+       rgba[i][3] = 255;
+       rgba[i+1][0] = FX_rgb_scale_5[(pixel >> 27) & 0x1F];
+       rgba[i+1][1] = FX_rgb_scale_6[(pixel >> 21) & 0x3F];
+       rgba[i+1][2] = FX_rgb_scale_5[(pixel >> 16) & 0x1F];
+       rgba[i+1][3] = 255;
+    }
+    if (extraPixel) {
+       GLushort pixel = data16[n];
+       rgba[n][0] = FX_rgb_scale_5[(pixel >> 11) & 0x1F];
+       rgba[n][1] = FX_rgb_scale_6[(pixel >> 5)  & 0x3F];
+       rgba[n][2] = FX_rgb_scale_5[ pixel        & 0x1F];
+       rgba[n][3] = 255;
+    }
+
+    grLfbUnlock(GR_LFB_READ_ONLY, fxMesa->currentFB);
+ }
 }
 
-static void fxDDReadRGBAPixels(const GLcontext *ctx,
-                               GLuint n, const GLint x[], const GLint y[],
-                               GLubyte rgba[][4], const GLubyte mask[])
+/*
+ * Read a span of 32-bit RGB pixels.  Note, we don't worry about cliprects
+ * since OpenGL says obscured pixels have undefined values.
+ */
+static void fxReadRGBASpan_ARGB8888 (const GLcontext * ctx,
+                                     GLuint n,
+                                     GLint x, GLint y,
+                                     GLubyte rgba[][4])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-  GLushort data;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadRGBAPixels(...)\n");
-  }
-
-  for(i=0;i<n;i++)
-    if(mask[i]) {
-      grLfbReadRegion(fxMesa->currentFB,x[i],bottom-y[i],1,1,0,&data);
-   #if FXMESA_USE_ARGB 
-      rgba[i][RCOMP]=(data & 0xF800) >> 8;
-      rgba[i][GCOMP]=(data & 0x07E0) >> 3;
-      rgba[i][BCOMP]=(data & 0x001F) >> 8;
-   #else
-      rgba[i][RCOMP]=(data & 0x001f) << 3;
-      rgba[i][GCOMP]=(data & 0x07e0) >> 3;
-      rgba[i][BCOMP]=(data & 0xf800) >> 8;
-   #endif
-      /* the alpha value should be read from the auxiliary buffer when required */
-
-      rgba[i][ACOMP]=255;
-    }
+ fxMesaContext fxMesa = FX_CONTEXT(ctx);
+ GLuint i;
+ grLfbReadRegion(fxMesa->currentFB, x, fxMesa->height - 1 - y, n, 1, n * 4, rgba);
+ for (i = 0; i < n; i++) {
+     GLubyte c = rgba[i][0];
+     rgba[i][0] = rgba[i][2];
+     rgba[i][2] = c;
+ }
 }
 
+
 /************************************************************************/
-/*****                    Depth functions                           *****/
+/*****                    Depth functions (optimized)               *****/
 /************************************************************************/
 
-void fxDDReadDepthSpanFloat(GLcontext *ctx,
-                           GLuint n, GLint x, GLint y, GLfloat depth[])
+void
+fxReadDepthSpan_Z16(GLcontext * ctx,
+                   GLuint n, GLint x, GLint y, GLdepth depth[])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-  GLushort data[MAX_WIDTH];
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLint bottom = fxMesa->height - 1;
+   GLushort depth16[MAX_WIDTH];
+   GLuint i;
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadDepthSpanFloat(...)\n");
-  }
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "%s(...)\n", __FUNCTION__);
+   }
 
-  grLfbReadRegion(GR_BUFFER_AUXBUFFER,x,bottom-y,n,1,0,data);
+   grLfbReadRegion(GR_BUFFER_AUXBUFFER, x, bottom - y, n, 1, 0, depth16);
+   for (i = 0; i < n; i++) {
+      depth[i] = depth16[i];
+   }
+}
+
+
+void
+fxReadDepthSpan_Z24(GLcontext * ctx,
+                   GLuint n, GLint x, GLint y, GLdepth depth[])
+{
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLint bottom = fxMesa->height - 1;
+   GLuint i;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "%s(...)\n", __FUNCTION__);
+   }
+
+   grLfbReadRegion(GR_BUFFER_AUXBUFFER, x, bottom - y, n, 1, 0, depth);
+   for (i = 0; i < n; i++) {
+      depth[i] &= 0xffffff;
+   }
+}
 
-  /*
-    convert the read values to float values [0.0 .. 1.0].
+
+/************************************************************************/
+/*****                    Stencil functions (optimized)             *****/
+/************************************************************************/
+
+void fxWriteStencilSpan (GLcontext *ctx, GLuint n, GLint x, GLint y,
+                         const GLstencil stencil[], const GLubyte mask[])
+{
+ /*
+  * XXX todo
   */
-  for(i=0;i<n;i++)
-    depth[i]=data[i]/65535.0f;
 }
 
-void fxDDReadDepthSpanInt(GLcontext *ctx,
-                         GLuint n, GLint x, GLint y, GLdepth depth[])
+void
+fxReadStencilSpan(GLcontext * ctx,
+                 GLuint n, GLint x, GLint y, GLstencil stencil[])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLint bottom=fxMesa->height-1;
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   GLint bottom = fxMesa->height - 1;
+   GLuint zs32[MAX_WIDTH];
+   GLuint i;
 
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDReadDepthSpanInt(...)\n");
-  }
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "%s(...)\n", __FUNCTION__);
+   }
 
-  grLfbReadRegion(GR_BUFFER_AUXBUFFER,x,bottom-y,n,1,0,depth);
+   grLfbReadRegion(GR_BUFFER_AUXBUFFER, x, bottom - y, n, 1, 0, zs32);
+   for (i = 0; i < n; i++) {
+      stencil[i] = zs32[i] >> 24;
+   }
 }
 
-GLuint fxDDDepthTestSpanGeneric(GLcontext *ctx,
-                                       GLuint n, GLint x, GLint y, const GLdepth z[],
-                                       GLubyte mask[])
+void fxWriteStencilPixels (GLcontext *ctx, GLuint n,
+                           const GLint x[], const GLint y[],
+                           const GLstencil stencil[],
+                           const GLubyte mask[])
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLushort depthdata[MAX_WIDTH];
-  GLdepth *zptr=depthdata;
-  GLubyte *m=mask;
-  GLuint i;
-  GLuint passed=0;
-  GLint bottom=fxMesa->height-1;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDDepthTestSpanGeneric(...)\n");
-  }
-
-  grLfbReadRegion(GR_BUFFER_AUXBUFFER,x,bottom-y,n,1,0,depthdata);
-
-  /* switch cases ordered from most frequent to less frequent */
-  switch (ctx->Depth.Func) {
-  case GL_LESS:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0; i<n; i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] < *zptr) {
-            /* pass */
-            *zptr = z[i];
-            passed++;
-          } else {
-            /* fail */
-            *m = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0; i<n; i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] < *zptr) {
-            /* pass */
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_LEQUAL:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] <= *zptr) {
-            *zptr = z[i];
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] <= *zptr) {
-            /* pass */
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_GEQUAL:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] >= *zptr) {
-            *zptr = z[i];
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] >= *zptr) {
-            /* pass */
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_GREATER:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] > *zptr) {
-            *zptr = z[i];
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] > *zptr) {
-            /* pass */
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_NOTEQUAL:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] != *zptr) {
-            *zptr = z[i];
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] != *zptr) {
-            /* pass */
-            passed++;
-          } else {
-            *m = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_EQUAL:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] == *zptr) {
-            *zptr = z[i];
-            passed++;
-          } else {
-            *m =0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          if (z[i] == *zptr) {
-            /* pass */
-            passed++;
-          } else {
-            *m =0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_ALWAYS:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0;i<n;i++,zptr++,m++) {
-        if (*m) {
-          *zptr = z[i];
-          passed++;
-        }
-      }
-    } else {
-      /* Don't update Z buffer or mask */
-      passed = n;
-    }
-    break;
-  case GL_NEVER:
-    for (i=0;i<n;i++) {
-      mask[i] = 0;
-    }
-    break;
-  default:
-    ;
-  } /*switch*/
-
-  if(passed)
-    FX_grLfbWriteRegion(GR_BUFFER_AUXBUFFER,x,bottom-y,GR_LFB_SRC_FMT_ZA16,n,1,0,depthdata);
+ /*
+  * XXX todo
+  */
+}
 
-  return passed;
+void fxReadStencilPixels (GLcontext *ctx, GLuint n,
+                          const GLint x[], const GLint y[],
+                          GLstencil stencil[])
+{
+ /*
+  * XXX todo
+  */
 }
 
-void fxDDDepthTestPixelsGeneric(GLcontext* ctx,
-                                       GLuint n, const GLint x[], const GLint y[],
-                                       const GLdepth z[], GLubyte mask[])
+
+
+/*
+ * This function is called to specify which buffer to read and write
+ * for software rasterization (swrast) fallbacks.  This doesn't necessarily
+ * correspond to glDrawBuffer() or glReadBuffer() calls.
+ */
+static void
+fxDDSetBuffer(GLcontext * ctx, GLframebuffer * buffer, GLuint bufferBit)
 {
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GLdepth zval;
-  GLuint i;
-  GLint bottom=fxMesa->height-1;
-
-  if (MESA_VERBOSE&VERBOSE_DRIVER) {
-     fprintf(stderr,"fxmesa: fxDDDepthTestPixelsGeneric(...)\n");
-  }
-
-  /* switch cases ordered from most frequent to less frequent */
-  switch (ctx->Depth.Func) {
-  case GL_LESS:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] < zval) {
-            /* pass */
-            FX_grLfbWriteRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],GR_LFB_SRC_FMT_ZA16,1,1,0,(void*)&z[i]);
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] < zval) {
-            /* pass */
-          }
-          else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_LEQUAL:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] <= zval) {
-            /* pass */
-            FX_grLfbWriteRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],GR_LFB_SRC_FMT_ZA16,1,1,0,(void*)&z[i]);
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] <= zval) {
-            /* pass */
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_GEQUAL:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] >= zval) {
-            /* pass */
-            FX_grLfbWriteRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],GR_LFB_SRC_FMT_ZA16,1,1,0,(void*)&z[i]);
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] >= zval) {
-            /* pass */
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_GREATER:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] > zval) {
-            /* pass */
-            FX_grLfbWriteRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],GR_LFB_SRC_FMT_ZA16,1,1,0,(void*)&z[i]);
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] > zval) {
-            /* pass */
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_NOTEQUAL:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] != zval) {
-            /* pass */
-            FX_grLfbWriteRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],GR_LFB_SRC_FMT_ZA16,1,1,0,(void*)&z[i]);
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] != zval) {
-            /* pass */
-          }
-          else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_EQUAL:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] == zval) {
-            /* pass */
-            FX_grLfbWriteRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],GR_LFB_SRC_FMT_ZA16,1,1,0,(void*)&z[i]);
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    } else {
-      /* Don't update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          grLfbReadRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],1,1,0,&zval);
-          if (z[i] == zval) {
-            /* pass */
-          } else {
-            /* fail */
-            mask[i] = 0;
-          }
-        }
-      }
-    }
-    break;
-  case GL_ALWAYS:
-    if (ctx->Depth.Mask) {
-      /* Update Z buffer */
-      for (i=0; i<n; i++) {
-        if (mask[i]) {
-          FX_grLfbWriteRegion(GR_BUFFER_AUXBUFFER,x[i],bottom-y[i],GR_LFB_SRC_FMT_ZA16,1,1,0,(void*)&z[i]);
-        }
-      }
-    } else {
-      /* Don't update Z buffer or mask */
-    }
-    break;
-  case GL_NEVER:
-    /* depth test never passes */
-    for (i=0;i<n;i++) {
-      mask[i] = 0;
-    }
-    break;
-  default:
-    ;
-  } /*switch*/
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+   (void) buffer;
+
+   if (TDFX_DEBUG & VERBOSE_DRIVER) {
+      fprintf(stderr, "%s(%x)\n", __FUNCTION__, (int)bufferBit);
+   }
+
+   if (bufferBit == FRONT_LEFT_BIT) {
+      fxMesa->currentFB = GR_BUFFER_FRONTBUFFER;
+      grRenderBuffer(fxMesa->currentFB);
+   }
+   else if (bufferBit == BACK_LEFT_BIT) {
+      fxMesa->currentFB = GR_BUFFER_BACKBUFFER;
+      grRenderBuffer(fxMesa->currentFB);
+   }
 }
 
+
 /************************************************************************/
 
 
-void fxSetupDDSpanPointers(GLcontext *ctx)
+
+void
+fxSetupDDSpanPointers(GLcontext * ctx)
 {
-  ctx->Driver.WriteRGBASpan       =fxDDWriteRGBASpan;
-  ctx->Driver.WriteRGBSpan        =fxDDWriteRGBSpan;
-  ctx->Driver.WriteMonoRGBASpan   =fxDDWriteMonoRGBASpan;
-  ctx->Driver.WriteRGBAPixels     =fxDDWriteRGBAPixels;
-  ctx->Driver.WriteMonoRGBAPixels =fxDDWriteMonoRGBAPixels;
-
-  ctx->Driver.WriteCI8Span        =NULL;
-  ctx->Driver.WriteCI32Span       =NULL;
-  ctx->Driver.WriteMonoCISpan     =NULL;
-  ctx->Driver.WriteCI32Pixels     =NULL;
-  ctx->Driver.WriteMonoCIPixels   =NULL;
-
-  ctx->Driver.ReadRGBASpan        =fxDDReadRGBASpan;
-  ctx->Driver.ReadRGBAPixels      =fxDDReadRGBAPixels;
-
-  ctx->Driver.ReadCI32Span        =NULL;
-  ctx->Driver.ReadCI32Pixels      =NULL;
+   struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
+   fxMesaContext fxMesa = FX_CONTEXT(ctx);
+
+   swdd->SetBuffer = fxDDSetBuffer;
+
+   switch (fxMesa->colDepth) {
+          case 15:
+               swdd->WriteRGBASpan = tdfxWriteRGBASpan_ARGB1555;
+               swdd->WriteRGBSpan = tdfxWriteRGBSpan_ARGB1555;
+               swdd->WriteRGBAPixels = tdfxWriteRGBAPixels_ARGB1555;
+               swdd->WriteMonoRGBASpan = tdfxWriteMonoRGBASpan_ARGB1555;
+               swdd->WriteMonoRGBAPixels = tdfxWriteMonoRGBAPixels_ARGB1555;
+               swdd->ReadRGBASpan = /*td*/fxReadRGBASpan_ARGB1555;
+               swdd->ReadRGBAPixels = tdfxReadRGBAPixels_ARGB1555;
+
+               swdd->WriteDepthSpan = tdfxWriteDepthSpan_Z16;
+               swdd->WriteDepthPixels = tdfxWriteDepthPixels_Z16;
+               swdd->ReadDepthSpan = /*td*/fxReadDepthSpan_Z16;
+               swdd->ReadDepthPixels = tdfxReadDepthPixels_Z16;
+               break;
+          case 16:
+               swdd->WriteRGBASpan = tdfxWriteRGBASpan_RGB565;
+               swdd->WriteRGBSpan = tdfxWriteRGBSpan_RGB565;
+               swdd->WriteRGBAPixels = tdfxWriteRGBAPixels_RGB565;
+               swdd->WriteMonoRGBASpan = tdfxWriteMonoRGBASpan_RGB565;
+               swdd->WriteMonoRGBAPixels = tdfxWriteMonoRGBAPixels_RGB565;
+               swdd->ReadRGBASpan = /*td*/fxReadRGBASpan_RGB565;
+               swdd->ReadRGBAPixels = tdfxReadRGBAPixels_RGB565;
+
+               swdd->WriteDepthSpan = tdfxWriteDepthSpan_Z16;
+               swdd->WriteDepthPixels = tdfxWriteDepthPixels_Z16;
+               swdd->ReadDepthSpan = /*td*/fxReadDepthSpan_Z16;
+               swdd->ReadDepthPixels = tdfxReadDepthPixels_Z16;
+               break;
+          case 32:
+               swdd->WriteRGBASpan = tdfxWriteRGBASpan_ARGB8888;
+               swdd->WriteRGBSpan = tdfxWriteRGBSpan_ARGB8888;
+               swdd->WriteRGBAPixels = tdfxWriteRGBAPixels_ARGB8888;
+               swdd->WriteMonoRGBASpan = tdfxWriteMonoRGBASpan_ARGB8888;
+               swdd->WriteMonoRGBAPixels = tdfxWriteMonoRGBAPixels_ARGB8888;
+               swdd->ReadRGBASpan = /*td*/fxReadRGBASpan_ARGB8888;
+               swdd->ReadRGBAPixels = tdfxReadRGBAPixels_ARGB8888;
+
+               swdd->WriteDepthSpan = tdfxWriteDepthSpan_Z24;
+               swdd->WriteDepthPixels = tdfxWriteDepthPixels_Z24;
+               swdd->ReadDepthSpan = /*td*/fxReadDepthSpan_Z24;
+               swdd->ReadDepthPixels = tdfxReadDepthPixels_Z24;
+               break;
+   }
+
+   if (fxMesa->haveHwStencil) {
+      swdd->WriteStencilSpan = fxWriteStencilSpan;
+      swdd->ReadStencilSpan = fxReadStencilSpan;
+      swdd->WriteStencilPixels = fxWriteStencilPixels;
+      swdd->ReadStencilPixels = fxReadStencilPixels;
+   }
+#if 0
+   swdd->WriteCI8Span          = NULL;
+   swdd->WriteCI32Span         = NULL;
+   swdd->WriteMonoCISpan       = NULL;
+   swdd->WriteCI32Pixels       = NULL;
+   swdd->WriteMonoCIPixels     = NULL;
+   swdd->ReadCI32Span          = NULL;
+   swdd->ReadCI32Pixels                = NULL;
+
+   swdd->SpanRenderStart        = tdfxSpanRenderStart; /* BEGIN_BOARD_LOCK */
+   swdd->SpanRenderFinish       = tdfxSpanRenderFinish; /* END_BOARD_LOCK */
+#endif
 }
 
 
@@ -835,9 +653,11 @@ void fxSetupDDSpanPointers(GLcontext *ctx)
  * Need this to provide at least one external definition.
  */
 
-int gl_fx_dummy_function_span(void)
+extern int gl_fx_dummy_function_span(void);
+int
+gl_fx_dummy_function_span(void)
 {
-  return 0;
+   return 0;
 }
 
-#endif  /* FX */
+#endif /* FX */