Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / drivers / dri / mach64 / mach64_span.c

diff --git a/src/mesa/drivers/dri/mach64/mach64_span.c b/src/mesa/drivers/dri/mach64/mach64_span.c
index 5c2403f587f64ba5894eab033d5edbcf26853300..0c52c0c88cb4b5814595cd01d6a3ad8de37c84c1 100644 (file)
--- a/src/mesa/drivers/dri/mach64/mach64_span.c
+++ b/src/mesa/drivers/dri/mach64/mach64_span.c
@@ -31,7 +31,6 @@
 
 #include "mach64_context.h"
 #include "mach64_ioctl.h"
-#include "mach64_state.h"
 #include "mach64_span.h"
 
 #include "swrast/swrast.h"
@@ -40,8 +39,8 @@
 
 #define LOCAL_VARS                                                     \
    mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);                       \
-   __DRIscreenPrivate *sPriv = mmesa->driScreen;                       \
-   __DRIdrawablePrivate *dPriv = mmesa->driDrawable;                   \
+   __DRIscreen *sPriv = mmesa->driScreen;                      \
+   __DRIdrawable *dPriv = mmesa->driDrawable;                  \
    driRenderbuffer *drb = (driRenderbuffer *) rb;                      \
    GLuint height = dPriv->h;                                           \
    GLushort p;                                                         \
@@ -49,8 +48,8 @@
 
 #define LOCAL_DEPTH_VARS                                               \
    mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);                       \
-   __DRIdrawablePrivate *dPriv = mmesa->driDrawable;                   \
-   __DRIscreenPrivate *driScreen = mmesa->driScreen;                   \
+   __DRIdrawable *dPriv = mmesa->driDrawable;                  \
+   __DRIscreen *driScreen = mmesa->driScreen;                  \
    driRenderbuffer *drb = (driRenderbuffer *) rb;                      \
    GLuint height = dPriv->h;                                           \
    char *buf = (char *)(driScreen->pFB + drb->offset +                 \
@@ -117,6 +116,8 @@
 
 /* 16 bit depthbuffer functions.
  */
+#define VALUE_TYPE GLushort
+
 #define WRITE_DEPTH( _x, _y, d )                                       \
    *(GLushort *)(buf + ((_x) + (_y) * drb->pitch) * 2) = d;
 
@@ -155,15 +156,13 @@ void mach64DDInitSpanFuncs( GLcontext *ctx )
 void
 mach64SetSpanFunctions(driRenderbuffer *drb, const GLvisual *vis)
 {
-   if (drb->Base.InternalFormat == GL_RGBA) {
-      if (vis->redBits == 5 && vis->greenBits == 6 && vis->blueBits == 5) {
-         mach64InitPointers_RGB565(&drb->Base);
-      }
-      else {
-         mach64InitPointers_ARGB8888(&drb->Base);
-      }
+   if (drb->Base.Format == MESA_FORMAT_RGB565) {
+      mach64InitPointers_RGB565(&drb->Base);
+   }
+   else if (drb->Base.Format == MESA_FORMAT_ARGB8888) {
+      mach64InitPointers_ARGB8888(&drb->Base);
    }
-   else if (drb->Base.InternalFormat == GL_DEPTH_COMPONENT16) {
+   else if (drb->Base.Format == MESA_FORMAT_Z16) {
       mach64InitDepthPointers_z16(&drb->Base);
    }
 }