Changeset 20550 in vbox for trunk/src

Timestamp:

Jun 14, 2009 4:25:49 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: dri fixes

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxvideo.h (modified) (1 diff)
• vboxvideo_15.c (modified) (2 diffs)
• vboxvideo_dri.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -253 +253 @@
 extern Bool VBOXDRIScreenInit(int scrnIndex, ScreenPtr pScreen, VBOXPtr pVBox);
 extern Bool VBOXDRIFinishScreenInit(ScreenPtr pScreen);
+extern void VBOXDRIUpdateStride(ScrnInfoPtr pScrn, VBOXPtr pVBox);
 extern void VBOXDRICloseScreen(ScreenPtr pScreen, VBOXPtr pVBox);
 

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c

@@ -245 +245 @@
         scrn->virtualY = height;
         scrn->displayWidth = width;
+        VBOXDRIUpdateStride(scrn, pVBox);
     }
     TRACE_LOG("returning %s\n", rc ? "TRUE" : "FALSE");
@@ -986 +987 @@
         return (FALSE);
 
+    /* Needed before we initialise DRI. */
+    pScrn->displayWidth = pScrn->virtualX;
+
 #ifdef VBOX_DRI
     pVBox->useDRI = VBOXDRIScreenInit(scrnIndex, pScreen, pVBox);

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c

@@ -173 +173 @@
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
                    "DRI is only available in 16bpp or 32bpp graphics modes.\n");
+        rc = FALSE;
+    }
+    /* Assertion */
+    if (   (pScrn->displayWidth == 0)
+        || (pVBox->pciInfo == NULL)
+        || (pVBox->base == NULL)
+        || (pVBox->mapSize == 0))
+    {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: preconditions failed\n",
+                   __PRETTY_FUNCTION__);
         rc = FALSE;
     }
@@ -251 +261 @@
         pDRIInfo->frameBufferPhysicalAddress = pVBox->base;
         pDRIInfo->frameBufferSize = pVBox->mapSize;
-        pDRIInfo->frameBufferStride = pScrn->displayWidth;
+        pDRIInfo->frameBufferStride =   pScrn->displayWidth
+                                      * pScrn->bitsPerPixel / 8;
         pDRIInfo->SAREASize = SAREA_MAX;  /* we have no private bits yet. */
         /* This can't be zero, as the server callocs this size and checks for
@@ -305 +316 @@
 }
 
+void VBOXDRIUpdateStride(ScrnInfoPtr pScrn, VBOXPtr pVBox)
+{
+    DRIInfoPtr pDRIInfo = pVBox->pDRIInfo;
+    pDRIInfo->frameBufferStride =   pScrn->displayWidth
+                                  * pScrn->bitsPerPixel / 8;
+}
+
 void
 VBOXDRICloseScreen(ScreenPtr pScreen, VBOXPtr pVBox)