Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all

    framebuffer formats except cfb and the overlay modes should work, and
    r128 and radeon need to be loaded from the ati driver (both issues to
    be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
    drivers. elfloader users shouldn't be affected.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/riva_xaa.c b/src/riva_xaa.c
index a7d30a0..2d3fdc6 100644
--- a/src/riva_xaa.c
+++ b/src/riva_xaa.c
@@ -92,7 +92,7 @@ RivaSetRopSolid(RivaPtr pRiva, int rop)
             RivaSetPattern(pRiva, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
         pRiva->currentRop = rop;
         RIVA_FIFO_FREE(pRiva->riva, Rop, 1);
-        pRiva->riva.Rop->Rop3 = XAACopyROP[rop];
+        pRiva->riva.Rop->Rop3 = XAAGetCopyROP(rop);
     }
 }
 
@@ -102,7 +102,7 @@ RivaSetRopPattern(RivaPtr pRiva, int rop)
     if (pRiva->currentRop != (rop + 16)) {
         pRiva->currentRop = rop + 16; /* +16 is important */
         RIVA_FIFO_FREE(pRiva->riva, Rop, 1);
-        pRiva->riva.Rop->Rop3 = XAAPatternROP[rop];
+        pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
     }
 }
 
@@ -458,7 +458,7 @@ RivaValidatePolyPoint(
    unsigned long changes,
    DrawablePtr pDraw
 ){
-   pGC->ops->PolyPoint = XAAFallbackOps.PolyPoint;
+   pGC->ops->PolyPoint = XAAGetFallbackOps()->PolyPoint;
 
    if(pGC->planemask != ~0) return;