Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / drivers / dri / i810 / i810span.c

diff --git a/src/mesa/drivers/dri/i810/i810span.c b/src/mesa/drivers/dri/i810/i810span.c
index 2112800eebccd0ec81dcbc002869e4cdb5c50c72..6576f6745eac0ad9e6e338171779b71498325054 100644 (file)
--- a/src/mesa/drivers/dri/i810/i810span.c
+++ b/src/mesa/drivers/dri/i810/i810span.c
@@ -1,21 +1,21 @@
-#include "glheader.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "colormac.h"
+#include "main/glheader.h"
+#include "main/macros.h"
+#include "main/mtypes.h"
+#include "main/colormac.h"
+#include "swrast/swrast.h"
 
 #include "i810screen.h"
 #include "i810_dri.h"
 
 #include "i810span.h"
 #include "i810ioctl.h"
-#include "swrast/swrast.h"
 
 
 #define DBG 0
 
 #define LOCAL_VARS                                     \
    i810ContextPtr imesa = I810_CONTEXT(ctx);           \
-   __DRIdrawablePrivate *dPriv = imesa->driDrawable;   \
+   __DRIdrawable *dPriv = imesa->driDrawable;  \
    driRenderbuffer *drb = (driRenderbuffer *) rb;      \
    GLuint pitch = drb->pitch;                          \
    GLuint height = dPriv->h;                           \
@@ -27,7 +27,7 @@
 
 #define LOCAL_DEPTH_VARS                               \
    i810ContextPtr imesa = I810_CONTEXT(ctx);           \
-   __DRIdrawablePrivate *dPriv = imesa->driDrawable;   \
+   __DRIdrawable *dPriv = imesa->driDrawable;  \
    driRenderbuffer *drb = (driRenderbuffer *) rb;      \
    GLuint pitch = drb->pitch;                          \
    GLuint height = dPriv->h;                           \
@@ -67,6 +67,8 @@ do {                                                                  \
 
 /* 16 bit depthbuffer functions.
  */
+#define VALUE_TYPE GLushort
+
 #define WRITE_DEPTH( _x, _y, d ) \
    *(GLushort *)(buf + (_x)*2 + (_y)*pitch)  = d;