1 files changed, 98 insertions, 400 deletions

diff --git a/xc/extras/Mesa/src/FX/fxdd.c b/xc/extras/Mesa/src/FX/fxdd.c
index a21ed31df..fc8bbb824 100644
--- a/xc/extras/Mesa/src/FX/fxdd.c
+++ b/xc/extras/Mesa/src/FX/fxdd.c
@@ -52,7 +52,6 @@
 
 #if defined(FX)
 
-#include <dlfcn.h>
 #include "image.h"
 #include "types.h"
 #include "fxdrv.h"
@@ -103,20 +102,34 @@ void fxInitPixelTables(fxMesaContext fxMesa, GLboolean bgrOrder)
 /*****                 Miscellaneous functions                    *****/
 /**********************************************************************/
 
+/* Enalbe/Disable dithering */
+static void fxDDDither(GLcontext *ctx, GLboolean enable)
+{
+  if (MESA_VERBOSE&VERBOSE_DRIVER) {
+    fprintf(stderr,"fxmesa: fxDDDither()\n");
+  }
+
+  if (enable) {
+    FX_grDitherMode(GR_DITHER_4x4);
+  } else {
+    FX_grDitherMode(GR_DITHER_DISABLE);
+  }
+}
+
 
 /* Return buffer size information */
 static void fxDDBufferSize(GLcontext *ctx, GLuint *width, GLuint *height)
 {
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
 
-  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+  if (MESA_VERBOSE&VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDBufferSize(...) Start\n");
   }
 
-  *width = fxMesa->width;
-  *height = fxMesa->height;
+  *width=fxMesa->width;
+  *height=fxMesa->height;
 
-  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+  if (MESA_VERBOSE&VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDBufferSize(...) End\n");
   }
 }
@@ -126,13 +139,15 @@ static void fxDDBufferSize(GLcontext *ctx, GLuint *width, GLuint *height)
 static void fxDDSetColor(GLcontext *ctx, GLubyte red, GLubyte green,
                          GLubyte blue, GLubyte alpha )
 {
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GLubyte col[4];
   ASSIGN_4V( col, red, green, blue, alpha );
-  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+  
+  if (MESA_VERBOSE&VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDSetColor(%d,%d,%d,%d)\n",red,green,blue,alpha);
   }
-  fxMesa->color = FXCOLOR4(col);
+
+  fxMesa->color=FXCOLOR4(col);
 }
 
 
@@ -140,14 +155,19 @@ static void fxDDSetColor(GLcontext *ctx, GLubyte red, GLubyte green,
 static void fxDDClearColor(GLcontext *ctx, GLubyte red, GLubyte green,
                            GLubyte blue, GLubyte alpha )
 {
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
+  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GLubyte col[4];
+
+
+
   ASSIGN_4V( col, red, green, blue, 255 );
-  if (MESA_VERBOSE & VERBOSE_DRIVER) {
+
+  if (MESA_VERBOSE&VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDClearColor(%d,%d,%d,%d)\n",red,green,blue,alpha);
   }
-  fxMesa->clearC = FXCOLOR4( col );
-  fxMesa->clearA = alpha;
+ 
+  fxMesa->clearC=FXCOLOR4( col );
+  fxMesa->clearA=alpha;
 }
 
 
@@ -157,18 +177,11 @@ static GLbitfield fxDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
-  const FxU32 clearD = (FxU32) (ctx->Depth.Clear * fxMesa->depthClear);
-  const FxU32 clearS = (FxU32) (ctx->Stencil.Clear);
-  GLbitfield softwareMask = mask & (DD_ACCUM_BIT);
+  const FxU16 clearD = (FxU16) (ctx->Depth.Clear * 0xffff);
+  GLbitfield softwareMask = mask & (DD_STENCIL_BIT | DD_ACCUM_BIT);
 
-  /* we can't clear accum buffers */
-  mask &= ~(DD_ACCUM_BIT);
-
-  if ((mask & DD_STENCIL_BIT) && !fxMesa->haveHwStencil) {
-    /* software stencil buffer */
-    mask &= ~(DD_STENCIL_BIT);
-    softwareMask |= DD_STENCIL_BIT;
-  }
+  /* we can't clear stencil or accum buffers */
+  mask &= ~(DD_STENCIL_BIT | DD_ACCUM_BIT);
 
   if (MESA_VERBOSE & VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxDDClear(%d,%d,%d,%d)\n", (int) x, (int) y,
@@ -181,35 +194,16 @@ static GLbitfield fxDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
     mask &= ~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT);
   }
 
-
-  /* disable stencil ops if enabled (it screws up clearing) */
-  if (fxMesa->haveHwStencil) {
-    if (ctx->Stencil.Enabled)
-      FX_grDisable(GR_STENCIL_MODE_EXT);
-
-    if (mask & DD_STENCIL_BIT) {
-      FX_grStencilMask(0xff);
-      /* set stencil ref value = desired clear value */
-      FX_grStencilFunc(GR_CMP_ALWAYS, ctx->Stencil.Clear, 0xff);
-    }
-    else {
-      FX_grStencilMask(0x00);
-    }
-  }
-
   /*
    * This could probably be done fancier but doing each possible case
    * explicitly is less error prone.
    */
-  switch (mask & ~DD_STENCIL_BIT) {
+  switch (mask) {
     case DD_BACK_LEFT_BIT | DD_DEPTH_BIT:
       /* back buffer & depth */
       FX_grDepthMask(FXTRUE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       if (!ctx->Depth.Mask) {
         FX_grDepthMask(FXFALSE);
       }
@@ -223,26 +217,17 @@ static GLbitfield fxDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
       FX_grDepthMask(FXTRUE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
       FX_grColorMask(FXFALSE,FXFALSE);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       /* clear front */
       FX_grColorMask(FXTRUE, ctx->Color.ColorMask[ACOMP] && fxMesa->haveAlphaBuffer);
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       break;
     case DD_BACK_LEFT_BIT:
       /* back buffer only */
       FX_grDepthMask(FXFALSE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       if (ctx->Depth.Mask) {
         FX_grDepthMask(FXTRUE);
       }
@@ -251,10 +236,7 @@ static GLbitfield fxDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
       /* front buffer only */
       FX_grDepthMask(FXFALSE);
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       if (ctx->Depth.Mask) {
         FX_grDepthMask(FXTRUE);
       }
@@ -263,15 +245,9 @@ static GLbitfield fxDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
       /* front and back */
       FX_grDepthMask(FXFALSE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       if (ctx->Depth.Mask) {
         FX_grDepthMask(FXTRUE);
       }
@@ -280,17 +256,11 @@ static GLbitfield fxDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
       /* clear front */
       FX_grDepthMask(FXFALSE);
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       /* clear back and depth */
       FX_grDepthMask(FXTRUE);
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       if (!ctx->Depth.Mask) {
         FX_grDepthMask(FXFALSE);
       }
@@ -300,27 +270,18 @@ static GLbitfield fxDDClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
       FX_grColorMask(FXFALSE,FXFALSE);
       FX_grDepthMask(FXTRUE);
-      if (mask & DD_STENCIL_BIT)
-        FX_grBufferClearExt(fxMesa->clearC, fxMesa->clearA, clearD, clearS);
-      else
-        FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
+      FX_grBufferClear(fxMesa->clearC, fxMesa->clearA, clearD);
       FX_grColorMask(FXTRUE, ctx->Color.ColorMask[ACOMP] && fxMesa->haveAlphaBuffer);
       if (ctx->Color.DrawDestMask & FRONT_LEFT_BIT)
         FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
+      if (!ctx->Depth.Test || !ctx->Depth.Mask)
+        FX_grDepthMask(FXFALSE);
       break;
     default:
       /* error */
       ;
   }
 
-  if (fxMesa->haveHwStencil && ctx->Stencil.Enabled) {
-    /* restore stencil state to as it was before the clear */
-    FX_grEnable(GR_STENCIL_MODE_EXT);
-    FX_grStencilMask(ctx->Stencil.WriteMask);
-    FX_grStencilFunc(ctx->Stencil.Function - GL_NEVER,
-                     ctx->Stencil.Ref, ctx->Stencil.ValueMask);
-  }
-
   return softwareMask;
 }
 
@@ -378,58 +339,6 @@ static void fxDDSetReadBuffer(GLcontext *ctx, GLframebuffer *buffer,
 }
 
 
-/*
- * These functions just set new-state flags.  The exact state
- * values will be evaluated later.
- */
-static void
-fxDDStencilFunc(GLcontext *ctx, GLenum func, GLint ref, GLuint mask)
-{
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
-  (void) func;  (void) ref;  (void) mask;
-  fxMesa->new_state |= FX_NEW_STENCIL;
-  ctx->Driver.RenderStart = fxSetupFXUnits;
-}
-
-static void
-fxDDStencilMask(GLcontext *ctx, GLuint mask)
-{
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
-  (void) mask;
-  fxMesa->new_state |= FX_NEW_STENCIL;
-  ctx->Driver.RenderStart = fxSetupFXUnits;
-}
-
-static void
-fxDDStencilOp(GLcontext *ctx, GLenum sfail, GLenum zfail, GLenum zpass)
-{
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
-  (void) sfail;  (void) zfail;  (void) zpass;
-  fxMesa->new_state |= FX_NEW_STENCIL;
-  ctx->Driver.RenderStart = fxSetupFXUnits;
-}
-
-static void
-fxDDDepthFunc(GLcontext *ctx, GLenum func)
-{
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
-  (void) func;
-  fxMesa->new_state |= FX_NEW_DEPTH;
-  ctx->Driver.RenderStart = fxSetupFXUnits;
-}
-
-static void
-fxDDDepthMask(GLcontext *ctx, GLboolean mask)
-{
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
-  (void) mask;
-  fxMesa->new_state |= FX_NEW_DEPTH;
-  ctx->Driver.RenderStart = fxSetupFXUnits;
-}
-
-
-
-
 #ifdef XF86DRI
 /* test if window coord (px,py) is visible */
 static GLboolean inClipRects(fxMesaContext fxMesa, int px, int py)
@@ -446,12 +355,10 @@ static GLboolean inClipRects(fxMesaContext fxMesa, int px, int py)
 #endif
 
 
-
-static GLboolean
-bitmap_R5G6B5(GLcontext *ctx, GLint px, GLint py,
-              GLsizei width, GLsizei height,
-              const struct gl_pixelstore_attrib *unpack,
-              const GLubyte *bitmap)
+static GLboolean fxDDDrawBitmap(GLcontext *ctx, GLint px, GLint py,
+                                GLsizei width, GLsizei height,
+                                const struct gl_pixelstore_attrib *unpack,
+                                const GLubyte *bitmap)
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   GrLfbInfo_t info;
@@ -622,186 +529,11 @@ bitmap_R5G6B5(GLcontext *ctx, GLint px, GLint py,
 }
 
 
-static GLboolean
-bitmap_R8G8B8A8(GLcontext *ctx, GLint px, GLint py,
-                GLsizei width, GLsizei height,
-                const struct gl_pixelstore_attrib *unpack,
-                const GLubyte *bitmap)
-{
-  fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
-  GrLfbInfo_t info;
-  GrLfbWriteMode_t mode;
-  /*FxU16 color;*/
-  GLuint color;
-  const struct gl_pixelstore_attrib *finalUnpack;
-  struct gl_pixelstore_attrib scissoredUnpack;
-
-  /* check if there's any raster operations enabled which we can't handle */
-  if (ctx->RasterMask & (ALPHATEST_BIT |
-                         BLEND_BIT |
-                         DEPTH_BIT |
-                         FOG_BIT |
-                         LOGIC_OP_BIT |
-                         SCISSOR_BIT |
-                         STENCIL_BIT |
-                         MASKING_BIT |
-                         ALPHABUF_BIT |
-                         MULTI_DRAW_BIT))
-    return GL_FALSE;
-
-  if (ctx->Scissor.Enabled) {
-    /* This is a bit tricky, but by carefully adjusting the px, py,
-     * width, height, skipPixels and skipRows values we can do
-     * scissoring without special code in the rendering loop.
-     */
-
-    /* we'll construct a new pixelstore struct */
-    finalUnpack = &scissoredUnpack;
-    scissoredUnpack = *unpack;
-    if (scissoredUnpack.RowLength == 0)
-      scissoredUnpack.RowLength = width;
-
-    /* clip left */
-    if (px < ctx->Scissor.X) {
-      scissoredUnpack.SkipPixels += (ctx->Scissor.X - px);
-      width -= (ctx->Scissor.X - px);
-      px = ctx->Scissor.X;
-    }
-    /* clip right */
-    if (px + width >= ctx->Scissor.X + ctx->Scissor.Width) {
-      width -= (px + width - (ctx->Scissor.X + ctx->Scissor.Width));
-    }
-    /* clip bottom */
-    if (py < ctx->Scissor.Y) {
-      scissoredUnpack.SkipRows += (ctx->Scissor.Y - py);
-      height -= (ctx->Scissor.Y - py);
-      py = ctx->Scissor.Y;
-    }
-    /* clip top */
-    if (py + height >= ctx->Scissor.Y + ctx->Scissor.Height) {
-      height -= (py + height - (ctx->Scissor.Y + ctx->Scissor.Height));
-    }
-
-    if (width <= 0 || height <= 0)
-      return GL_TRUE;  /* totally scissored away */
-  }  
-  else {
-    finalUnpack = unpack;
-  }
-
-  /* compute pixel value */
-  {
-    GLint r = (GLint) (ctx->Current.RasterColor[0] * 255.0f);
-    GLint g = (GLint) (ctx->Current.RasterColor[1] * 255.0f);
-    GLint b = (GLint) (ctx->Current.RasterColor[2] * 255.0f);
-    GLint a = (GLint) (ctx->Current.RasterColor[3] * 255.0f);
-    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
-      color = PACK_BGRA32(r, g, b, a);
-    else
-      color = PACK_RGBA32(r, g, b, a);
-  }
-
-  if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT)
-    mode = GR_LFBWRITEMODE_8888;
-  else
-    mode = GR_LFBWRITEMODE_888;
-
-  info.size = sizeof(info);
-  if (!FX_grLfbLock(GR_LFB_WRITE_ONLY,
-                    fxMesa->currentFB,
-                    mode,
-                    GR_ORIGIN_UPPER_LEFT,
-                    FXFALSE,
-                    &info)) {
-#ifndef FX_SILENT
-    fprintf(stderr,"fx Driver: error locking the linear frame buffer\n");
-#endif
-    return GL_TRUE;
-  }
-
-#ifdef XF86DRI
-#define INSIDE(c, x, y) inClipRects((c), (x), (y))
-#else
-#define INSIDE(c, x, y) (1)
-#endif
-
-  {
-    const GLint winX = fxMesa->x_offset;
-    const GLint winY = fxMesa->y_offset + fxMesa->height - 1;
-    GLint dstStride;
-    GLuint *dst;
-    GLint row;
-
-    if (fxMesa->glCtx->Color.DrawBuffer == GL_FRONT) {
-      dstStride = fxMesa->screen_width;
-      dst = (GLuint *) info.lfbPtr + (winY - py) * dstStride + (winX + px);
-    }
-    else {
-      dstStride = info.strideInBytes / 4;
-      dst = (GLuint *) info.lfbPtr + (winY - py) * dstStride + (winX + px);
-    }
-
-    /* compute dest address of bottom-left pixel in bitmap */
-    for (row = 0; row < height; row++) {
-      const GLubyte *src = (const GLubyte *) _mesa_image_address( finalUnpack,
-                 bitmap, width, height, GL_COLOR_INDEX, GL_BITMAP, 0, row, 0 );
-      if (finalUnpack->LsbFirst) {
-        /* least significan bit first */
-        GLubyte mask = 1U << (finalUnpack->SkipPixels & 0x7);
-        GLint col;
-        for (col=0; col<width; col++) {
-          if (*src & mask) {
-            if (INSIDE(fxMesa, winX + px + col, winY - py - row))
-              dst[col] = color;
-          }
-          if (mask == 128U) {
-            src++;
-            mask = 1U;
-          }
-          else {
-            mask = mask << 1;
-          }
-        }
-        if (mask != 1)
-          src++;
-      }
-      else {
-        /* most significan bit first */
-        GLubyte mask = 128U >> (finalUnpack->SkipPixels & 0x7);
-        GLint col;
-        for (col=0; col<width; col++) {
-          if (*src & mask) {
-            if (INSIDE(fxMesa, winX + px + col, winY - py - row))
-              dst[col] = color;
-          }
-          if (mask == 1U) {
-            src++;
-            mask = 128U;
-          }
-          else {
-            mask = mask >> 1;
-          }
-        }
-        if (mask != 128)
-          src++;
-      }
-      dst -= dstStride;
-    }
-  }
-
-#undef INSIDE
-
-  FX_grLfbUnlock(GR_LFB_WRITE_ONLY,fxMesa->currentFB);
-  return GL_TRUE;
-}
-
-
-static GLboolean
-readpixels_R5G6B5( GLcontext *ctx, GLint x, GLint y,
-                   GLsizei width, GLsizei height,
-                   GLenum format, GLenum type,
-                   const struct gl_pixelstore_attrib *packing,
-                   GLvoid *dstImage )
+static GLboolean fxDDReadPixels( GLcontext *ctx, GLint x, GLint y,
+                                 GLsizei width, GLsizei height,
+                                 GLenum format, GLenum type,
+                                 const struct gl_pixelstore_attrib *packing,
+                                 GLvoid *dstImage )
 {
   if (ctx->Pixel.ScaleOrBiasRGBA || ctx->Pixel.MapColorFlag) {
     return GL_FALSE;  /* can't do this */
@@ -812,7 +544,6 @@ readpixels_R5G6B5( GLcontext *ctx, GLint x, GLint y,
     GLboolean result = GL_FALSE;
 
     BEGIN_BOARD_LOCK();
-    info.size=sizeof(info);
     if (grLfbLock(GR_LFB_READ_ONLY,
                   fxMesa->currentFB,
                   GR_LFBWRITEMODE_ANY,
@@ -971,7 +702,7 @@ static const GLubyte *fxDDGetString(GLcontext *ctx, GLenum name)
           }
         }
         /* now make the GL_RENDERER string */
-        sprintf(buffer, "Mesa DRI %s 20000616", hardware);
+        sprintf(buffer, "Mesa DRI %s 20000510", hardware);
         return buffer;
       }
     case GL_VENDOR:
@@ -1028,19 +759,6 @@ static const GLubyte *fxDDGetString(GLcontext *ctx, GLenum name)
 
 int fxDDInitFxMesaContext( fxMesaContext fxMesa )
 {
-  /* Get Glide3vn function pointers */
-  {
-    void *handle;
-    handle = dlopen(NULL, RTLD_NOW | RTLD_GLOBAL);
-    if (!handle)
-      return 0;
-    grStencilFuncPtr = dlsym(handle, "grStencilFunc");
-    grStencilMaskPtr = dlsym(handle, "grStencilMask");
-    grStencilOpPtr = dlsym(handle, "grStencilOp");
-    grBufferClearExtPtr = dlsym(handle, "grBufferClearExt");
-    /* call dlclose()? */
-  }
-
   
    FX_setupGrVertexLayout();
    
@@ -1067,8 +785,6 @@ int fxDDInitFxMesaContext( fxMesaContext fxMesa )
    else
       fxMesa->verbose=GL_FALSE;
 
-   fxMesa->depthClear = FX_grGetInteger(FX_ZDEPTH_MAX);
-
    fxMesa->color=0xffffffff;
    fxMesa->clearC=0;
    fxMesa->clearA=0;
@@ -1079,6 +795,7 @@ int fxDDInitFxMesaContext( fxMesaContext fxMesa )
    fxMesa->stats.memTexUpload=0;
 
    fxMesa->tmuSrc=FX_TMU_NONE;
+   fxMesa->lastUnitsMode=FX_UM_NONE;
    fxTMInit(fxMesa);
 
    /* FX units setup */
@@ -1093,19 +810,16 @@ int fxDDInitFxMesaContext( fxMesaContext fxMesa )
    fxMesa->unitsState.blendSrcFuncAlpha=GR_BLEND_ONE;
    fxMesa->unitsState.blendDstFuncAlpha=GR_BLEND_ZERO;
 
-   /*
    fxMesa->unitsState.depthTestEnabled	=GL_FALSE;
    fxMesa->unitsState.depthMask		=GL_TRUE;
    fxMesa->unitsState.depthTestFunc	=GR_CMP_LESS;
-   */
 
    FX_grColorMask(FXTRUE, fxMesa->haveAlphaBuffer ? FXTRUE : FXFALSE);
-   if (fxMesa->glVis->DBflag) {
-      fxMesa->currentFB = GR_BUFFER_BACKBUFFER;
+   if(fxMesa->haveDoubleBuffer) {
+      fxMesa->currentFB=GR_BUFFER_BACKBUFFER;
       FX_grRenderBuffer(GR_BUFFER_BACKBUFFER);
-   }
-   else {
-      fxMesa->currentFB = GR_BUFFER_FRONTBUFFER;
+   } else {
+      fxMesa->currentFB=GR_BUFFER_FRONTBUFFER;
       FX_grRenderBuffer(GR_BUFFER_FRONTBUFFER);
    }
   
@@ -1121,7 +835,7 @@ int fxDDInitFxMesaContext( fxMesaContext fxMesa )
       return 0;
    }
 
-   if (fxMesa->glVis->DepthBits > 0)
+   if(fxMesa->haveZBuffer)
       FX_grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
     
 #if (!FXMESA_USE_ARGB)
@@ -1134,7 +848,7 @@ int fxDDInitFxMesaContext( fxMesaContext fxMesa )
    fxMesa->glCtx->Const.MaxTextureUnits=fxMesa->emulateTwoTMUs ? 2 : 1;
    fxMesa->glCtx->NewState|=NEW_DRVSTATE1;
    fxMesa->new_state = NEW_ALL;
-
+  
    fxDDSetupInit();
    fxDDCvaInit();
    fxDDClipInit();
@@ -1164,10 +878,6 @@ int fxDDInitFxMesaContext( fxMesaContext fxMesa )
 	 fxMesa->glCtx->PipelineStage,
 	 fxMesa->glCtx->NrPipelineStages);
 
-   /* this little bit ensures that all Glide state gets initialized */
-   fxMesa->new_state = NEW_ALL;
-   fxMesa->glCtx->Driver.RenderStart = fxSetupFXUnits;
-
    /* Run the config file */
    gl_context_initialize( fxMesa->glCtx );
 
@@ -1238,7 +948,8 @@ static GLboolean fxIsInHardware(GLcontext *ctx)
   if (!ctx->Hint.AllowDrawMem)
      return GL_TRUE;		/* you'll take it and like it */
 
-  if(((ctx->Color.BlendEnabled) && (ctx->Color.BlendEquation!=GL_FUNC_ADD_EXT)) ||
+  if((ctx->RasterMask & (STENCIL_BIT | MULTI_DRAW_BIT)) ||
+     ((ctx->Color.BlendEnabled) && (ctx->Color.BlendEquation!=GL_FUNC_ADD_EXT)) ||
      ((ctx->Color.ColorLogicOpEnabled) && (ctx->Color.LogicOp!=GL_COPY)) ||
      (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) ||
      (!((ctx->Color.ColorMask[RCOMP]==ctx->Color.ColorMask[GCOMP]) &&
@@ -1322,9 +1033,6 @@ static GLboolean fxIsInHardware(GLcontext *ctx)
     }
   }
 
-  if (ctx->Stencil.Enabled && !fxMesa->haveHwStencil)
-    return GL_FALSE;
-
   return GL_TRUE;
 }
 
@@ -1376,47 +1084,44 @@ static void fxDDReducedPrimitiveChange(GLcontext *ctx, GLenum prim)
   }
 }
 
-
 void fxSetupDDPointers(GLcontext *ctx)
 {
-  fxMesaContext fxMesa = FX_CONTEXT(ctx);
-
-  if (MESA_VERBOSE & VERBOSE_DRIVER) {
-    fprintf(stderr, "fxmesa: fxSetupDDPointers()\n");
+  if (MESA_VERBOSE&VERBOSE_DRIVER) {
+    fprintf(stderr,"fxmesa: fxSetupDDPointers()\n");
   }
-  ctx->Driver.UpdateState = fxDDUpdateDDPointers;
-  ctx->Driver.ClearIndex = NULL;
-  ctx->Driver.ClearColor = fxDDClearColor;
-  ctx->Driver.Clear = fxDDClear;
-  ctx->Driver.Index = NULL;
-  ctx->Driver.Color = fxDDSetColor;
-  ctx->Driver.SetDrawBuffer = fxDDSetDrawBuffer;
-  ctx->Driver.SetReadBuffer = fxDDSetReadBuffer;
-  ctx->Driver.GetBufferSize = fxDDBufferSize;
-  ctx->Driver.Finish = fxDDFinish;
-  ctx->Driver.Flush = NULL;
-  ctx->Driver.GetString = fxDDGetString;
-  ctx->Driver.NearFar = fxDDSetNearFar;
-  ctx->Driver.GetParameteri = fxDDGetParameteri;
+
+  ctx->Driver.UpdateState=fxDDUpdateDDPointers;
 
   ctx->Driver.WriteDepthSpan=fxDDWriteDepthSpan;
   ctx->Driver.WriteDepthPixels=fxDDWriteDepthPixels;
   ctx->Driver.ReadDepthSpan=fxDDReadDepthSpan;
   ctx->Driver.ReadDepthPixels=fxDDReadDepthPixels;
          
-  if (ctx->Visual->RedBits == 8 &&
-      ctx->Visual->GreenBits == 8 &&
-      ctx->Visual->BlueBits == 8 &&
-      ctx->Visual->AlphaBits == 8) {
-    ctx->Driver.Bitmap = bitmap_R8G8B8A8;
-    ctx->Driver.DrawPixels = NULL;
-    ctx->Driver.ReadPixels = NULL;
-  }
-  else {
-    ctx->Driver.Bitmap = bitmap_R5G6B5;
-    ctx->Driver.DrawPixels = NULL;
-    ctx->Driver.ReadPixels = readpixels_R5G6B5;
-  }
+  ctx->Driver.GetString=fxDDGetString;
+
+  ctx->Driver.Dither=fxDDDither;
+
+  ctx->Driver.NearFar=fxDDSetNearFar;
+
+  ctx->Driver.GetParameteri=fxDDGetParameteri;
+
+  ctx->Driver.ClearIndex=NULL;
+  ctx->Driver.ClearColor=fxDDClearColor;
+  ctx->Driver.Clear=fxDDClear;
+
+  ctx->Driver.Index=NULL;
+  ctx->Driver.Color=fxDDSetColor;
+
+  ctx->Driver.SetDrawBuffer=fxDDSetDrawBuffer;
+  ctx->Driver.SetReadBuffer=fxDDSetReadBuffer;
+  ctx->Driver.GetBufferSize=fxDDBufferSize;
+
+  ctx->Driver.Bitmap=fxDDDrawBitmap;
+  ctx->Driver.DrawPixels=NULL;
+  ctx->Driver.ReadPixels=fxDDReadPixels;
+
+  ctx->Driver.Finish=fxDDFinish;
+  ctx->Driver.Flush=NULL;
 
   ctx->Driver.RenderStart=NULL;
   ctx->Driver.RenderFinish=NULL;
@@ -1432,12 +1137,6 @@ void fxSetupDDPointers(GLcontext *ctx)
 
   ctx->Driver.RectFunc=NULL;
 
-  if (fxMesa->haveHwStencil) {
-    ctx->Driver.StencilFunc = fxDDStencilFunc;
-    ctx->Driver.StencilMask = fxDDStencilMask;
-    ctx->Driver.StencilOp   = fxDDStencilOp;
-  }
-
   ctx->Driver.AlphaFunc=fxDDAlphaFunc;
   ctx->Driver.BlendFunc=fxDDBlendFunc;
   ctx->Driver.DepthFunc=fxDDDepthFunc;
@@ -1474,7 +1173,6 @@ void fxSetupDDPointers(GLcontext *ctx)
 }
 
 
-
 #else