Changeset 21253 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Jul 6, 2009 2:29:39 PM (16 years ago)

Author:

vboxsync

Message:

video hw accel: Blt fixes/enhances, Flip basis for Guest driver & QGLFramebuffer

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display

Files:

• dd.c (modified) (6 diffs)
• driver.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -48 +48 @@
 static DECLCALLBACK(void) vboxVHWAFreeCmdCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext);
 static DECLCALLBACK(void) vboxVHWASurfBltCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext);
-
+static DECLCALLBACK(void) vboxVHWASurfFlipCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext);
 #endif
 
@@ -1037 +1037 @@
             if(ASMAtomicUoReadU32(&pDesc->cPendingBltsSrc)
                     || ASMAtomicUoReadU32(&pDesc->cPendingBltsDst)
-                    || ASMAtomicUoReadU32(&pDesc->cPendingFlips))
+                    || ASMAtomicUoReadU32(&pDesc->cPendingFlipsTarg)
+                    || ASMAtomicUoReadU32(&pDesc->cPendingFlipsCurr))
             {
                 lpLock->ddRVal = DDERR_WASSTILLDRAWING;
@@ -1471 +1472 @@
 DWORD APIENTRY DdFlip(PDD_FLIPDATA  lpFlip)
 {
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    PPDEV pDev = (PPDEV)lpFlip->lpDD->dhpdev;
+    DD_SURFACE_LOCAL*   lpTargSurfaceLocal = lpFlip->lpSurfTarg;
+    DD_SURFACE_GLOBAL*  lpTargSurfaceGlobal = lpTargSurfaceLocal->lpGbl;
+    DD_SURFACE_LOCAL*   lpCurrSurfaceLocal = lpFlip->lpSurfCurr;
+    DD_SURFACE_GLOBAL*  lpCurrSurfaceGlobal = lpCurrSurfaceLocal->lpGbl;
+    PVBOXVHWASURFDESC pCurrDesc = (PVBOXVHWASURFDESC)lpCurrSurfaceGlobal->dwReserved1;
+    PVBOXVHWASURFDESC pTargDesc = (PVBOXVHWASURFDESC)lpTargSurfaceGlobal->dwReserved1;
+    VBOXVHWACMD* pCmd;
+
     DISPDBG((0, "%s\n", __FUNCTION__));
-    lpFlip->ddRVal = DD_OK;
+
+    /* ensure we have host cmds processed to update pending blits and flips */
+    vboxVHWACommandCheckHostCmds(pDev);
+
+//    if(VBOXDD_CHECKFLAG(lpLock, DDLOCK_DONOTWAIT))
+    {
+        if(
+//                ASMAtomicUoReadU32(&pDesc->cPendingBltsSrc)
+//                || ASMAtomicUoReadU32(&pDesc->cPendingBltsDst)
+//                ||
+                ASMAtomicUoReadU32(&pCurrDesc->cPendingFlipsTarg)
+                || ASMAtomicUoReadU32(&pCurrDesc->cPendingFlipsCurr)
+                || ASMAtomicUoReadU32(&pTargDesc->cPendingFlipsTarg)
+                || ASMAtomicUoReadU32(&pTargDesc->cPendingFlipsCurr))
+        {
+            lpFlip->ddRVal = DDERR_WASSTILLDRAWING;
+            return DDHAL_DRIVER_HANDLED;
+        }
+    }
+
+    pCmd = vboxVHWACommandCreate (pDev, VBOXVHWACMD_TYPE_SURF_FLIP, sizeof(VBOXVHWACMD_SURF_FLIP));
+    //    int rc = VERR_GENERAL_FAILURE;
+    if(pCmd)
+    {
+        VBOXVHWACMD_SURF_FLIP * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_FLIP);
+
+        memset(pBody, 0, sizeof(VBOXVHWACMD_SURF_FLIP));
+
+        pBody->u.in.offCurrSurface = (uint64_t)lpCurrSurfaceGlobal->fpVidMem;
+        pBody->u.in.offTargSurface = (uint64_t)lpTargSurfaceGlobal->fpVidMem;
+
+        pBody->u.in.hTargSurf = pTargDesc->hHostHandle;
+        pBody->u.in.hCurrSurf = pCurrDesc->hHostHandle;
+        pBody->TargGuestSurfInfo = (uint64_t)pTargDesc;
+        pBody->CurrGuestSurfInfo = (uint64_t)pCurrDesc;
+
+//        pBody->u.in.flags = vboxVHWAFromDDFLIPs(lpFlip->dwFlags);
+
+        ASMAtomicIncU32(&pCurrDesc->cPendingFlipsCurr);
+        ASMAtomicIncU32(&pTargDesc->cPendingFlipsTarg);
+
+//            if(VBOXDD_CHECKFLAG(lpBlt->dwFlags, DDBLT_ASYNC))
+//            {
+                vboxVHWACommandSubmitAsynch(pDev, pCmd, vboxVHWASurfFlipCompletion, NULL);
+//            }
+//            else
+//            {
+//                vboxVHWACommandSubmit(pDev, pCmd);
+//            }
+        lpFlip->ddRVal = DD_OK;
+    }
+    else
+    {
+        lpFlip->ddRVal = DDERR_GENERIC;
+    }
     return DDHAL_DRIVER_HANDLED;
+#else
+    DISPDBG((0, "%s\n", __FUNCTION__));
+    lpFlip->ddRVal = DDERR_GENERIC;
+    return DDHAL_DRIVER_NOTHANDLED;
+#endif
 }
 
 DWORD APIENTRY DdGetBltStatus(PDD_GETBLTSTATUSDATA  lpGetBltStatus)
 {
+    PPDEV pDev = (PPDEV)lpGetBltStatus->lpDD->dhpdev;
+
     DISPDBG((0, "%s\n", __FUNCTION__));
 
@@ -1484 +1556 @@
         lpGetBltStatus->ddRVal = DD_OK;
     }
-    else
-    {
-        lpGetBltStatus->ddRVal = DD_OK;
+    else /* DDGBS_ISBLTDONE */
+    {
+        DD_SURFACE_LOCAL*   lpSurfaceLocal = lpGetBltStatus->lpDDSurface;
+        DD_SURFACE_GLOBAL*  lpSurfaceGlobal = lpSurfaceLocal->lpGbl;
+        PVBOXVHWASURFDESC pDesc = (PVBOXVHWASURFDESC)lpSurfaceGlobal->dwReserved1;
+
+        /* ensure we have host cmds processed to update pending blits and flips */
+        vboxVHWACommandCheckHostCmds(pDev);
+
+        if(
+                    ASMAtomicUoReadU32(&pDesc->cPendingBltsSrc)
+                    || ASMAtomicUoReadU32(&pDesc->cPendingBltsDst)
+    //                || ASMAtomicUoReadU32(&pDesc->cPendingFlipsTarg)
+    //                || ASMAtomicUoReadU32(&pDesc->cPendingFlipsCurr)
+                    )
+        {
+            lpGetBltStatus->ddRVal = DDERR_WASSTILLDRAWING;
+        }
+        else
+        {
+            lpGetBltStatus->ddRVal = DD_OK;
+        }
     }
 
@@ -1494 +1585 @@
 DWORD APIENTRY DdGetFlipStatus(PDD_GETFLIPSTATUSDATA  lpGetFlipStatus)
 {
+    PPDEV pDev = (PPDEV)lpGetFlipStatus->lpDD->dhpdev;
+    DD_SURFACE_LOCAL*   lpSurfaceLocal = lpGetFlipStatus->lpDDSurface;
+    DD_SURFACE_GLOBAL*  lpSurfaceGlobal = lpSurfaceLocal->lpGbl;
+    PVBOXVHWASURFDESC pDesc = (PVBOXVHWASURFDESC)lpSurfaceGlobal->dwReserved1;
+
     DISPDBG((0, "%s\n", __FUNCTION__));
-    if(lpGetFlipStatus->dwFlags == DDGFS_CANFLIP)
+
+    /* ensure we have host cmds processed to update pending blits and flips */
+    vboxVHWACommandCheckHostCmds(pDev);
+
+    if(
+//                ASMAtomicUoReadU32(&pDesc->cPendingBltsSrc)
+//                || ASMAtomicUoReadU32(&pDesc->cPendingBltsDst)
+//                ||
+                ASMAtomicUoReadU32(&pDesc->cPendingFlipsTarg)
+                || ASMAtomicUoReadU32(&pDesc->cPendingFlipsCurr)
+                )
+    {
+        lpGetFlipStatus->ddRVal = DDERR_WASSTILLDRAWING;
+    }
+    else
     {
         lpGetFlipStatus->ddRVal = DD_OK;
     }
-    else
-    {
-        lpGetFlipStatus->ddRVal = DD_OK;
-    }
+
+//    if(lpGetFlipStatus->dwFlags == DDGFS_CANFLIP)
+//    {
+//        lpGetFlipStatus->ddRVal = DD_OK;
+//    }
+//    else
+//    {
+//        lpGetFlipStatus->ddRVal = DD_OK;
+//    }
 
     return DDHAL_DRIVER_HANDLED;
@@ -1848 +1963 @@
 }
 
+static DECLCALLBACK(void) vboxVHWASurfFlipCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext)
+{
+    VBOXVHWACMD_SURF_FLIP * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_FLIP);
+    PVBOXVHWASURFDESC pCurrDesc = (PVBOXVHWASURFDESC)pBody->CurrGuestSurfInfo;
+    PVBOXVHWASURFDESC pTargDesc = (PVBOXVHWASURFDESC)pBody->TargGuestSurfInfo;
+
+    ASMAtomicDecU32(&pCurrDesc->cPendingFlipsCurr);
+    ASMAtomicDecU32(&pTargDesc->cPendingFlipsTarg);
+
+    vboxVHWACommandFree(ppdev, pCmd);
+}
+
 #endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -106 +106 @@
     volatile uint32_t cPendingBltsSrc;
     volatile uint32_t cPendingBltsDst;
-    volatile uint32_t cPendingFlips;
+    volatile uint32_t cPendingFlipsCurr;
+    volatile uint32_t cPendingFlipsTarg;
     uint32_t cBitsPerPixel;
 }VBOXVHWASURFDESC, *PVBOXVHWASURFDESC;