Changeset 22836 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 8, 2009 12:57:09 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52067

Message:

video hw accel: bugfixes

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (4 diffs)
• src/VBoxFBOverlay.cpp (modified) (10 diffs)
• src/VBoxFBQGL.cpp (modified) (2 diffs)

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

@@ -965 +965 @@
 };
 
+#define VBOXVHWACMDPIPEC_NEWEVENT      0x00000001
+#define VBOXVHWACMDPIPEC_COMPLETEEVENT 0x00000002
 class VBoxVHWACommandElementProcessor
 {
@@ -970 +972 @@
     VBoxVHWACommandElementProcessor(class VBoxConsoleView *aView);
     ~VBoxVHWACommandElementProcessor();
-    void postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData);
+    void postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData, uint32_t flags);
+    void completeCurrentEvent();
     class VBoxVHWACommandElement * detachCmdList(class VBoxVHWACommandElement * pFirst2Free, VBoxVHWACommandElement * pLast2Free);
 
@@ -1185 +1188 @@
                              ULONG aW, ULONG aH);
 
+    /**
+     * to be called on RequestResize framebuffer call
+     * @return true if the request was processed & should not be forwarded to the framebuffer
+     * false - otherwise */
+    bool onRequestResize (ULONG aScreenId, ULONG aPixelFormat,
+                              BYTE *aVRAM, ULONG aBitsPerPixel, ULONG aBytesPerLine,
+                              ULONG aWidth, ULONG aHeight,
+                              BOOL *aFinished)
+    {
+        mCmdPipe.completeCurrentEvent();
+        return false;
+    }
+
     VBOXFBOVERLAY_RESUT onPaintEvent (const QPaintEvent *pe, QRect *pRect);
     void onResizeEvent (const class VBoxResizeEvent *re);
@@ -1308 +1324 @@
     }
 
+    STDMETHOD(RequestResize) (ULONG aScreenId, ULONG aPixelFormat,
+                              BYTE *aVRAM, ULONG aBitsPerPixel, ULONG aBytesPerLine,
+                              ULONG aWidth, ULONG aHeight,
+                              BOOL *aFinished)
+   {
+        if(mOverlay.onRequestResize (aScreenId, aPixelFormat,
+                aVRAM, aBitsPerPixel, aBytesPerLine,
+                aWidth, aHeight,
+                aFinished))
+        {
+            return S_OK;
+        }
+        return T::RequestResize (aScreenId, aPixelFormat,
+                aVRAM, aBitsPerPixel, aBytesPerLine,
+                aWidth, aHeight,
+                aFinished);
+   }
+
     STDMETHOD(NotifyUpdate) (ULONG aX, ULONG aY,
                              ULONG aW, ULONG aH)

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

@@ -3403 +3403 @@
 //            Assert(mbVGASurfCreated);
             mDisplay.getVGA()->getComplexList()->add(surf);
+#ifdef DEBUG_misha
             Assert(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_VISIBLE);
+#endif
 //            if(pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_VISIBLE)
             {
@@ -3747 +3749 @@
         vboxCheckUpdateAddress (pDstSurf, pCmd->u.in.offDstSurface);
         VBOXQGLLOG(("pDstSurf (0x%x)\n",pDstSurf));
+#ifdef DEBUG_misha
         Assert(pDstSurf == mDisplay.getVGA());
         Assert(mDisplay.getVGA() == mDisplay.getPrimary());
+#endif
         Assert(pDstSurf->getComplexList() == mDisplay.getVGA()->getComplexList());
 
@@ -5100 +5104 @@
 int VBoxQGLOverlay::onVHWACommand(struct _VBOXVHWACMD * pCmd)
 {
-//    Assert(0);
-//    VBOXVHWACMD * pCmd = (VBOXVHWACMD*)pCommand;
+    uint32_t flags = 0;
+    switch(pCmd->enmCmd)
+    {
+        case VBOXVHWACMD_TYPE_SURF_FLIP:
+        case VBOXVHWACMD_TYPE_SURF_OVERLAY_UPDATE:
+        case VBOXVHWACMD_TYPE_SURF_OVERLAY_SETPOSITION:
+            flags |= VBOXVHWACMDPIPEC_COMPLETEEVENT;
+            break;
+        default:
+            break;
+    }//    Assert(0);
     /* indicate that we process and complete the command asynchronously */
     pCmd->Flags |= VBOXVHWACMD_FLAG_HG_ASYNCH;
-    /* post the command to the GUI thread for processing */
-//    QApplication::postEvent (mView,
-//                             new VBoxVHWACommandProcessEvent (pCmd));
-    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_VHWA, pCmd);
+
+    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_VHWA, pCmd, flags);
     return VINF_SUCCESS;
-//    return E_NOTIMPL;
+
 }
 
@@ -5138 +5149 @@
 #if 1
     QRect r(aX, aY, aW, aH);
-    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_PAINT, &r);
+    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_PAINT, &r, 0);
     return true;
 #else
@@ -5645 +5656 @@
 }
 
-void VBoxVHWACommandElementProcessor::postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData)
+void VBoxVHWACommandElementProcessor::completeCurrentEvent()
+{
+    RTCritSectEnter(&mCritSect);
+    mbNewEvent = true;
+    RTCritSectLeave(&mCritSect);
+}
+
+void VBoxVHWACommandElementProcessor::postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData, uint32_t flags)
 {
     /* 1. lock*/
@@ -5661 +5679 @@
     }
     pCmd->setData(aType, pvData);
+
+    if((flags & VBOXVHWACMDPIPEC_NEWEVENT) != 0)
+    {
+        mbNewEvent = true;
+    }
+
     /* 2. if can add to current*/
     if(!mbNewEvent)
@@ -5670 +5694 @@
             mpLastEvent->pipe().put(pCmd);
             /* 3.b unlock and return */
+            if((flags & VBOXVHWACMDPIPEC_COMPLETEEVENT) != 0)
+            {
+                mbNewEvent = true;
+            }
             RTCritSectLeave(&mCritSect);
             return;
@@ -5680 +5708 @@
     /* 5. create & initialize new Event */
     VBoxVHWACommandProcessEvent *pCurrentEvent = new VBoxVHWACommandProcessEvent(pCmd);
+    pCurrentEvent->mpNext = NULL;
+
     /* 6. lock */
     RTCritSectEnter(&mCritSect);
@@ -5688 +5718 @@
         mpFirstEvent = pCurrentEvent;
         mpLastEvent = pCurrentEvent;
-        pCurrentEvent->mpNext = NULL;
     }
     else
@@ -5696 +5725 @@
     }
     /* 8. reset blocking events counter */
-    mbNewEvent = false;
+    mbNewEvent = ((flags & VBOXVHWACMDPIPEC_COMPLETEEVENT) != 0);
     /* 9. unlock */
     RTCritSectLeave(&mCritSect);

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

@@ -79 +79 @@
 #else
     QRect r(aX, aY, aW, aH);
-    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_PAINT, &r);
+    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_PAINT, &r, 0);
 #endif
     return S_OK;
@@ -162 +162 @@
 //    QApplication::postEvent (mView,
 //                             new VBoxVHWACommandProcessEvent (pCmd));
-    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_VHWA, pCmd);
+    mCmdPipe.postCmd(VBOXVHWA_PIPECMD_VHWA, pCmd, 0);
     return S_OK;
 }