Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa

[mesa.git] / src / mesa / drivers / dri / unichrome / via_span.c

diff --git a/src/mesa/drivers/dri/unichrome/via_span.c b/src/mesa/drivers/dri/unichrome/via_span.c
index 5bffade9408995bb87da1e7498a9c14fce1f64d5..f1ed98036bf0c19b0a0d283d5faa80e1317be848 100644 (file)
--- a/src/mesa/drivers/dri/unichrome/via_span.c
+++ b/src/mesa/drivers/dri/unichrome/via_span.c
@@ -41,13 +41,12 @@
 
 #undef LOCAL_VARS
 #define LOCAL_VARS                                                     \
-    struct via_context *vmesa = VIA_CONTEXT(ctx);                      \
-    __DRIdrawablePrivate *dPriv = vmesa->driDrawable;                  \
     struct via_renderbuffer *vrb = (struct via_renderbuffer *) rb;     \
+    __DRIdrawablePrivate *dPriv = vrb->dPriv;                           \
     GLuint pitch = vrb->pitch;                                          \
     GLuint height = dPriv->h;                                          \
     GLint p = 0;                                                       \
-    char *buf = (char *)(vrb->origMap + vmesa->drawXoff * vrb->bpp);    \
+    char *buf = (char *)(vrb->origMap + vrb->drawXoff * vrb->bpp);      \
     (void) p;
 
 /* ================================================================
@@ -56,8 +55,7 @@
 
 /* 16 bit, RGB565 color spanline and pixel functions
  */
-#define GET_SRC_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)
-#define GET_DST_PTR(_x, _y) GET_SRC_PTR(_x, _y);
+#define GET_PTR(_x, _y) (buf + (_x) * 2 + (_y) * pitch)
 #define SPANTMP_PIXEL_FMT GL_RGB
 #define SPANTMP_PIXEL_TYPE GL_UNSIGNED_SHORT_5_6_5
 
@@ -68,8 +66,7 @@
 
 /* 32 bit, ARGB8888 color spanline and pixel functions
  */
-#define GET_SRC_PTR(_x, _y) (buf + (_x) * 4 + (_y) * pitch)
-#define GET_DST_PTR(_x, _y) GET_SRC_PTR(_x, _y);
+#define GET_PTR(_x, _y) (buf + (_x) * 4 + (_y) * pitch)
 #define SPANTMP_PIXEL_FMT GL_BGRA
 #define SPANTMP_PIXEL_TYPE GL_UNSIGNED_INT_8_8_8_8_REV
 
@@ -81,12 +78,11 @@
 /* 16 bit depthbuffer functions.
  */
 #define LOCAL_DEPTH_VARS                                            \
-    struct via_context *vmesa = VIA_CONTEXT(ctx);                   \
-    __DRIdrawablePrivate *dPriv = vmesa->driDrawable;               \
     struct via_renderbuffer *vrb = (struct via_renderbuffer *) rb;  \
+    __DRIdrawablePrivate *dPriv = vrb->dPriv;                       \
     GLuint depth_pitch = vrb->pitch;                                \
     GLuint height = dPriv->h;                                       \
-    char *buf = (char *)(vrb->map + (vmesa->drawXoff * vrb->bpp/8))
+    char *buf = (char *)(vrb->map + (vrb->drawXoff * vrb->bpp/8))
 
 #define LOCAL_STENCIL_VARS LOCAL_DEPTH_VARS 
 
@@ -150,7 +146,7 @@
 void viaSpanRenderStart( GLcontext *ctx )
 {
    struct via_context *vmesa = VIA_CONTEXT(ctx);     
-   viaWaitIdle(vmesa);
+   viaWaitIdle(vmesa, GL_FALSE);
    LOCK_HARDWARE(vmesa);
 }