Changeset 24925 in vbox for trunk

Timestamp:

Nov 24, 2009 10:59:37 PM (15 years ago)

Author:

vboxsync

Message:

2d video: fix VM reset issues

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (2 diffs)
• src/VBox/Additions/WINNT/Graphics/Display/dd.c (modified) (1 diff)
• src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (9 diffs)

trunk/include/VBox/VBoxVideo.h

@@ -320 +320 @@
 
 #define VBOXVHWACMD_HEADSIZE() (RT_OFFSETOF(VBOXVHWACMD, body))
-#define VBOXVHWACMD_SIZE(_tCmd) (VBOXVHWACMD_HEADSIZE() + sizeof(_tCmd))
+#define VBOXVHWACMD_SIZE_FROMBODYSIZE(_s) (VBOXVHWACMD_HEADSIZE() + (_s))
+#define VBOXVHWACMD_SIZE(_tCmd) (VBOXVHWACMD_SIZE_FROMBODYSIZE(sizeof(_tCmd)))
 typedef unsigned int VBOXVHWACMD_LENGTH;
 typedef uint64_t VBOXVHWA_SURFHANDLE;
@@ -734 +735 @@
     void * pVM;
 } VBOXVHWACMD_HH_CONSTRUCT;
+
+typedef DECLCALLBACK(void) FNVBOXVHWA_HH_CALLBACK(void*);
+typedef FNVBOXVHWA_HH_CALLBACK *PFNVBOXVHWA_HH_CALLBACK;
+
+#define VBOXVHWA_HH_CALLBACK_SET(_pCmd, _pfn, _parg) \
+    do { \
+        (_pCmd)->GuestVBVAReserved1 = (uint64_t)(_pfn); \
+        (_pCmd)->GuestVBVAReserved2 = (uint64_t)(_parg); \
+    }while(0)
+
+#define VBOXVHWA_HH_CALLBACK_GET(_pCmd) ((PFNVBOXVHWA_HH_CALLBACK)(_pCmd)->GuestVBVAReserved1)
+#define VBOXVHWA_HH_CALLBACK_GET_ARG(_pCmd) ((void*)(_pCmd)->GuestVBVAReserved2)
 
 #pragma pack()

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

@@ -1342 +1342 @@
             vboxVHWASurfDescFree(pDesc);
 
-            lpSurfaceGlobal->dwReserved1 = NULL;
+            lpSurfaceGlobal->dwReserved1 = (ULONG_PTR)NULL;
 
             lpDestroySurface->ddRVal = DD_OK;

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -1045 +1045 @@
 }
 
+static DECLCALLBACK(void) vbvaVHWAHHCommandSetEventCallback(void * pContext)
+{
+    RTSemEventSignal((RTSEMEVENT)pContext);
+}
+
 static int vbvaVHWAHHCommandPost(PVGASTATE pVGAState, VBOXVHWACMD* pCmd)
 {
@@ -1054 +1059 @@
         /* ensure the cmd is not deleted until we process it */
         vbvaVHWAHHCommandRetain (pCmd);
-        pCmd->GuestVBVAReserved1 = (uint64_t)hComplEvent;
+        VBOXVHWA_HH_CALLBACK_SET(pCmd, vbvaVHWAHHCommandSetEventCallback, (void*)hComplEvent);
         vbvaVHWAHandleCommand(pVGAState, NULL, pCmd);
         if((ASMAtomicReadU32((volatile uint32_t *)&pCmd->Flags)  & VBOXVHWACMD_FLAG_HG_ASYNCH) != 0)
@@ -1249 +1254 @@
     else
     {
-        if(pCmd->GuestVBVAReserved1)
-        {
-            RTSEMEVENT hComplEvent = (RTSEMEVENT)pCmd->GuestVBVAReserved1;
-            RTSemEventSignal(hComplEvent);
+        PFNVBOXVHWA_HH_CALLBACK pfn = VBOXVHWA_HH_CALLBACK_GET(pCmd);
+        if(pfn)
+        {
+            pfn(VBOXVHWA_HH_CALLBACK_GET_ARG(pCmd));
         }
         rc = VINF_SUCCESS;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

@@ -1104 +1104 @@
 #endif
 
+    int reset(VHWACommandList * pCmdList);
+
     ulong vboxBitsPerPixel() { return mDisplay.getVGA()->bitsPerPixel(); }
     ulong vboxBytesPerLine() { return mDisplay.getVGA() ? mDisplay.getVGA()->bytesPerLine() : 0; }
@@ -1402 +1404 @@
 
     int reset();
+
+    int resetGl();
         
     void initGl();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -165 +165 @@
 static bool g_bVBoxVHWAChecked = false;
 static bool g_bVBoxVHWASupported = false;
+
+static struct _VBOXVHWACMD * vhwaHHCmdCreate(VBOXVHWACMD_TYPE type, size_t size)
+{
+    char *buf = (char*)malloc(VBOXVHWACMD_SIZE_FROMBODYSIZE(size));
+    memset(buf, 0, size);
+    VBOXVHWACMD * pCmd = (VBOXVHWACMD*)buf;
+    pCmd->enmCmd = type;
+    pCmd->Flags = VBOXVHWACMD_FLAG_HH_CMD;
+    return pCmd;
+}
 
 static const VBoxVHWAInfo & vboxVHWAGetSupportInfo(const QGLContext *pContext)
@@ -2805 +2815 @@
 }
 
+int VBoxGLWidget::reset(VHWACommandList * pCmdList)
+{
+    VBOXVHWACMD * pCmd;
+    const OverlayList & overlays = mDisplay.overlays();
+    for (OverlayList::const_iterator oIt = overlays.begin();
+            oIt != overlays.end(); ++ oIt)
+    {
+        VBoxVHWASurfList * pSurfList = *oIt;
+        if(pSurfList->current())
+        {
+            /* 1. hide overlay */
+            pCmd = vhwaHHCmdCreate(VBOXVHWACMD_TYPE_SURF_OVERLAY_UPDATE, sizeof(VBOXVHWACMD_SURF_OVERLAY_UPDATE));
+            VBOXVHWACMD_SURF_OVERLAY_UPDATE *pOUCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_UPDATE);
+            pOUCmd->u.in.hSrcSurf = pSurfList->current()->handle();
+            pOUCmd->u.in.flags = VBOXVHWA_OVER_HIDE;
+
+            pCmdList->push_back(pCmd);
+        }
+
+        /* 2. destroy overlay */
+        const SurfList & surfaces = pSurfList->surfaces();
+
+        for (SurfList::const_iterator sIt = surfaces.begin();
+                sIt != surfaces.end(); ++ sIt)
+        {
+            VBoxVHWASurfaceBase *pCurSurf = (*sIt);
+            pCmd = vhwaHHCmdCreate(VBOXVHWACMD_TYPE_SURF_DESTROY, sizeof(VBOXVHWACMD_SURF_DESTROY));
+            VBOXVHWACMD_SURF_DESTROY *pSDCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
+            pSDCmd->u.in.hSurf = pCurSurf->handle();
+
+            pCmdList->push_back(pCmd);
+        }
+    }
+
+    /* 3. destroy primaries */
+    const SurfList & surfaces = mDisplay.primaries().surfaces();
+    for (SurfList::const_iterator sIt = surfaces.begin();
+            sIt != surfaces.end(); ++ sIt)
+    {
+        VBoxVHWASurfaceBase *pCurSurf = (*sIt);
+        if(pCurSurf->handle() != VBOXVHWA_SURFHANDLE_INVALID)
+        {
+            pCmd = vhwaHHCmdCreate(VBOXVHWACMD_TYPE_SURF_DESTROY, sizeof(VBOXVHWACMD_SURF_DESTROY));
+            VBOXVHWACMD_SURF_DESTROY *pSDCmd = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
+            pSDCmd->u.in.hSurf = pCurSurf->handle();
+
+            pCmdList->push_back(pCmd);
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
 void VBoxGLWidget::vboxDoVHWACmd(void *cmd)
@@ -3900 +3963 @@
 
     char *buf = (char*)malloc(VBOXVHWACMD_SIZE(VBOXVHWACMD_SURF_CREATE));
-    memset(buf, 0, sizeof(buf));
+    memset(buf, 0, sizeof(VBOXVHWACMD_SIZE(VBOXVHWACMD_SURF_CREATE)));
     VBOXVHWACMD * pCmd = (VBOXVHWACMD*)buf;
     pCmd->enmCmd = VBOXVHWACMD_TYPE_SURF_CREATE;
@@ -4059 +4122 @@
 //    char buf[VBOXVHWACMD_SIZE(VBOXVHWACMD_SURF_OVERLAY_UPDATE)];
     char *buf = new char[VBOXVHWACMD_SIZE(VBOXVHWACMD_SURF_CREATE)];
-    memset(buf, 0, sizeof(buf));
+    memset(buf, 0, VBOXVHWACMD_SIZE(VBOXVHWACMD_SURF_CREATE));
     VBOXVHWACMD * pCmd = (VBOXVHWACMD*)buf;
     pCmd->enmCmd = VBOXVHWACMD_TYPE_SURF_OVERLAY_UPDATE;
@@ -4233 +4296 @@
     if(buf)
     {
-        memset(buf, 0, sizeof(buf));
+        memset(buf, 0, sizeof(VBOXVHWACMD));
         VBOXVHWACMD * pCmd = (VBOXVHWACMD*)buf;
         pCmd->enmCmd = VBOXVHWACMD_TYPE_ENABLE;
@@ -5081 +5144 @@
                 break;
 #endif
+            case VBOXVHWA_PIPECMD_PAINT:
+                break;
             default:
                 /* should not happen, don't handle this for now */
@@ -5088 +5153 @@
         }
 
-#ifdef DEBUG
         VBoxVHWACommandElement *pTest = mCmdPipe.detachCmdList(pHead, pTail);
         Assert(!pTest);
         NOREF(pTest);
-#endif
+    }
+
+    resetGl();
+
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(void) vbvaVHWAHHCommandFreeCmd(void * pContext)
+{
+    free(pContext);
+}
+
+int VBoxQGLOverlay::resetGl()
+{
+    if(mpOverlayWidget)
+    {
+        VHWACommandList list;
+        int rc = mpOverlayWidget->reset(&list);
+        if(RT_SUCCESS(rc))
+        {
+            for (VHWACommandList::const_iterator sIt = list.begin();
+                    sIt != list.end(); ++ sIt)
+            {
+                VBOXVHWACMD *pCmd = (*sIt);
+                VBOXVHWA_HH_CALLBACK_SET(pCmd, vbvaVHWAHHCommandFreeCmd, pCmd);
+                mCmdPipe.postCmd(VBOXVHWA_PIPECMD_VHWA, pCmd, 0);
+            }
+        }
     }
     return VINF_SUCCESS;
@@ -5134 +5225 @@
     mGlCurrent = false; /* just a fall-back */
     VBoxVHWACommandElement * pFirst = mCmdPipe.detachCmdList(NULL, NULL);
-    do
+    while(pFirst) /* pFirst can be zero right after reset when all pending commands are flushed,
+                   * while events for those commands may still come along */
     {
         VBoxVHWACommandElement * pLast = processCmdList(pFirst);
 
         pFirst = mCmdPipe.detachCmdList(pFirst, pLast);
-    } while(pFirst);
+    }
 
     mProcessingCommands = false;
@@ -5872 +5964 @@
     {
         Assert(pLast);
-        pHead = pFirst->pipe().detachList();
         VBoxVHWACommandElement * pCurHead;
         for(VBoxVHWACommandProcessEvent * pCur = pFirst; pCur ; pCur = pCur->mpNext)