fix GL_LINE_LOOP with drivers using own render pipeline stage (#12410, #13527)

[mesa.git] / src / mesa / drivers / dri / mga / mgaspan.c

diff --git a/src/mesa/drivers/dri/mga/mgaspan.c b/src/mesa/drivers/dri/mga/mgaspan.c
index 494d1a36b60382493510deae03a26dfcdb13217e..05dcbb852639efbcbc94043d7fad8cc915dd2932 100644 (file)
--- a/src/mesa/drivers/dri/mga/mgaspan.c
+++ b/src/mesa/drivers/dri/mga/mgaspan.c
@@ -36,26 +36,25 @@
 
 #define LOCAL_VARS                                     \
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);             \
-   __DRIdrawablePrivate *dPriv = mmesa->mesa_drawable; \
    __DRIscreenPrivate *sPriv = mmesa->driScreen;       \
    driRenderbuffer *drb = (driRenderbuffer *) rb;      \
+   const __DRIdrawablePrivate *dPriv = drb->dPriv;     \
    GLuint pitch = drb->pitch;                          \
    GLuint height = dPriv->h;                           \
    char *buf = (char *)(sPriv->pFB +                   \
                        drb->offset +                   \
                        dPriv->x * drb->cpp +           \
                        dPriv->y * pitch);              \
-   char *read_buf = buf;                               \
    GLuint p;                                           \
-   (void) read_buf; (void) buf; (void) p
+   (void) buf; (void) p
 
 
 
 #define LOCAL_DEPTH_VARS                                               \
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);                             \
-   __DRIdrawablePrivate *dPriv = mmesa->mesa_drawable;                 \
    __DRIscreenPrivate *sPriv = mmesa->driScreen;                       \
    driRenderbuffer *drb = (driRenderbuffer *) rb;                      \
+   const __DRIdrawablePrivate *dPriv = drb->dPriv;                     \
    GLuint pitch = drb->pitch;                                          \
    GLuint height = dPriv->h;                                           \
    char *buf = (char *)(sPriv->pFB +                                   \
@@ -163,14 +162,16 @@
 #include "stenciltmp.h"
 
 
-void mgaSpanRenderStart( GLcontext *ctx )
+static void
+mgaSpanRenderStart( GLcontext *ctx )
 {
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);
    FLUSH_BATCH( mmesa );
    LOCK_HARDWARE_QUIESCENT( mmesa );
 }
 
-void mgaSpanRenderFinish( GLcontext *ctx )
+static void
+mgaSpanRenderFinish( GLcontext *ctx )
 {
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);
    _swrast_flush( ctx );