Changeset 19817 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

May 19, 2009 12:16:28 PM (16 years ago)

Author:

vboxsync

Message:

IFramebuffer cleanup next part:

• removed obsolete internal framebuffer
• removed IFramebuffer::setupInternalFramebuffer(), IFramebuffer::lockFramebuffer(), IFramebuffer::unlockFramebuffer(), IFramebuffer::registerExternalFramebuffer()
• removed unused finished parameter of IFramebuffer::NotifyUpdate()

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• DisplayImpl.cpp (modified) (5 diffs)
• DisplayImpl.h (modified) (2 diffs)
• Framebuffer.h (modified) (1 diff)
• SDLFramebuffer.cpp (modified) (2 diffs)
• SDLFramebuffer.h (modified) (1 diff)
• VBoxBFE.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

@@ -93 +93 @@
     mcbVbvaPartial = 0;
 
-    RTSemEventMultiCreate(&mUpdateSem);
-
-    // reset the event sems
-    RTSemEventMultiReset(mUpdateSem);
-
     // by default, we have an internal Framebuffer which is
     // NULL, i.e. a black hole for no display output
+    mFramebuffer = NULL;
+    mFramebufferOpened = false;
+
+    mu32ResizeStatus = ResizeStatus_Void;
+}
+
+VMDisplay::~VMDisplay()
+{
     mFramebuffer = 0;
-    mInternalFramebuffer = true;
-    mFramebufferOpened = false;
-
-    mu32ResizeStatus = ResizeStatus_Void;
-}
-
-VMDisplay::~VMDisplay()
-{
-    mFramebuffer = 0;
-    RTSemEventMultiDestroy(mUpdateSem);
 }
 
@@ -201 +194 @@
 
     // this is only valid for external framebuffers
-    if (mInternalFramebuffer)
+    if (!mFramebuffer)
         return E_FAIL;
 
@@ -259 +252 @@
     }
 
-    // special processing for the internal Framebuffer
-    if (mInternalFramebuffer)
-    {
-        mFramebuffer->Unlock();
-    }
-    else
-    {
-        // callback into the Framebuffer to notify it
-        BOOL finished;
-
-        RTSemEventMultiReset(mUpdateSem);
-
-        mFramebuffer->NotifyUpdate(x, y, w, h, &finished);
-        mFramebuffer->Unlock();
-
-        if (!finished)
-        {
-            // the Framebuffer needs more time to process
-            // the event so we have to halt the VM until it's done
-            RTSemEventMultiWait(mUpdateSem, RT_INDEFINITE_WAIT);
-        }
-    }
+    mFramebuffer->NotifyUpdate(x, y, w, h);
+    mFramebuffer->Unlock();
 }
 
@@ -336 +309 @@
  * @param Framebuffer external Framebuffer object
  */
-STDMETHODIMP VMDisplay::RegisterExternalFramebuffer(Framebuffer *Framebuffer)
+STDMETHODIMP VMDisplay::SetFramebuffer(unsigned iScreenID, Framebuffer *Framebuffer)
 {
     if (!Framebuffer)
@@ -343 +316 @@
     // free current Framebuffer (if there is any)
     mFramebuffer = 0;
-    mInternalFramebuffer = false;
     mFramebuffer = Framebuffer;
     updateDisplayData();

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.h

@@ -55 +55 @@
     uint32_t getBitsPerPixel();
 
-    STDMETHODIMP RegisterExternalFramebuffer(Framebuffer *Framebuffer);
+    STDMETHODIMP SetFramebuffer(unsigned iScreenID, Framebuffer *Framebuffer);
     STDMETHODIMP InvalidateAndUpdate();
     STDMETHODIMP ResizeCompleted();
@@ -84 +84 @@
 
     Framebuffer *mFramebuffer;
-    bool mInternalFramebuffer, mFramebufferOpened;
+    bool mFramebufferOpened;
 
     ULONG mSupportedAccelOps;
-    RTSEMEVENTMULTI mUpdateSem;
 
     struct _VBVAMEMORY *mpVbvaMemory;

trunk/src/VBox/Frontends/VBoxBFE/Framebuffer.h

@@ -44 +44 @@
     virtual HRESULT getBitsPerPixel(ULONG *bitsPerPixel) = 0;
     virtual HRESULT getLineSize(ULONG *lineSize) = 0;
-    virtual HRESULT NotifyUpdate(ULONG x, ULONG y,
-                            ULONG w, ULONG h, BOOL *finished) = 0;
+    virtual HRESULT NotifyUpdate(ULONG x, ULONG y, ULONG w, ULONG h) = 0;
     virtual HRESULT RequestResize(ULONG w, ULONG h, BOOL *finished) = 0;
 

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp

@@ -228 +228 @@
  */
 HRESULT SDLFramebuffer::NotifyUpdate(ULONG x, ULONG y,
-                                     ULONG w, ULONG h, BOOL *finished)
+                                     ULONG w, ULONG h)
 {
     LogFlow(("SDLFramebuffer::NotifyUpdate: x = %d, y = %d, w = %d, h = %d\n",
@@ -258 +258 @@
 #endif /* !VBOXBFE_WITH_X11 */
 
-    /*
-     * The Display thread can continue as we will lock the framebuffer
-     * from the SDL thread when we get to actually doing the update.
-     */
-    if (finished)
-        *finished = TRUE;
     return S_OK;
 }

trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h

@@ -50 +50 @@
     virtual HRESULT getBitsPerPixel(ULONG *bitsPerPixel);
     virtual HRESULT getLineSize(ULONG *lineSize);
-    virtual HRESULT NotifyUpdate(ULONG x, ULONG y,
-                            ULONG w, ULONG h, BOOL *finished);
+    virtual HRESULT NotifyUpdate(ULONG x, ULONG y, ULONG w, ULONG h);
     virtual HRESULT RequestResize(ULONG w, ULONG h, BOOL *finished);
     virtual HRESULT GetVisibleRegion(BYTE *aRectangles, ULONG aCount, ULONG *aCountCopied);

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -803 +803 @@
     if (!gConsole->initialized())
         goto leave;
-    gDisplay->RegisterExternalFramebuffer(gFramebuffer);
+    gDisplay->SetFramebuffer(0, gFramebuffer);
 
     /* start with something in the titlebar */