Changeset 19817 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

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()

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -23 +23 @@
 
 #include "DisplayImpl.h"
-#include "FramebufferImpl.h"
 #include "ConsoleImpl.h"
 #include "ConsoleVRDPServer.h"
@@ -86 +85 @@
     mpVMMDev = NULL;
     mfVMMDevInited = false;
-    RTSemEventMultiCreate(&mUpdateSem);
 
     mLastAddress = NULL;
@@ -124 +122 @@
     unconst (mParent) = aParent;
 
-    /* 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
-    mInternalFramebuffer = true;
     mFramebufferOpened = false;
-    mSupportedAccelOps = 0;
 
     ULONG ul;
@@ -185 +178 @@
     for (ul = 0; ul < mcMonitors; ul++)
         maFramebuffers[ul].pFramebuffer = NULL;
-
-    RTSemEventMultiDestroy (mUpdateSem);
 
     if (mParent)
@@ -507 +498 @@
     pFramebuffer->Lock();
 
-    /* special processing for the internal framebuffer */
-    if (mInternalFramebuffer)
-    {
-        pFramebuffer->Unlock();
-    } else
-    {
-        /* callback into the framebuffer to notify it */
-        BOOL finished = FALSE;
-
-        RTSemEventMultiReset(mUpdateSem);
-
-        checkCoordBounds (&x, &y, &w, &h, mpDrv->Connector.cx, mpDrv->Connector.cy);
-
-        if (w == 0 || h == 0)
-        {
-            /* Nothing to be updated. */
-            finished = TRUE;
-        }
-        else
-        {
-            pFramebuffer->NotifyUpdate(x, y, w, h, &finished);
-        }
-
-        if (!finished)
-        {
-            /*
-             *  the framebuffer needs more time to process
-             *  the event so we have to halt the VM until it's done
-             */
-            pFramebuffer->Unlock();
-            RTSemEventMultiWait(mUpdateSem, RT_INDEFINITE_WAIT);
-        } else
-        {
-            pFramebuffer->Unlock();
-        }
-
-        if (!mfVideoAccelEnabled)
-        {
-            /* When VBVA is enabled, the VRDP server is informed in the VideoAccelFlush.
-             * Inform the server here only if VBVA is disabled.
-             */
-            if (maFramebuffers[uScreenId].u32ResizeStatus == ResizeStatus_Void)
-            {
-                mParent->consoleVRDPServer()->SendUpdateBitmap(uScreenId, x, y, w, h);
-            }
-        }
-    }
-    return;
+    checkCoordBounds (&x, &y, &w, &h, mpDrv->Connector.cx, mpDrv->Connector.cy);
+
+    if (w != 0 && h != 0)
+        pFramebuffer->NotifyUpdate(x, y, w, h);
+
+    pFramebuffer->Unlock();
+
+    if (!mfVideoAccelEnabled)
+    {
+        /* When VBVA is enabled, the VRDP server is informed in the VideoAccelFlush.
+         * Inform the server here only if VBVA is disabled.
+         */
+        if (maFramebuffers[uScreenId].u32ResizeStatus == ResizeStatus_Void)
+            mParent->consoleVRDPServer()->SendUpdateBitmap(uScreenId, x, y, w, h);
+    }
 }
 
@@ -1344 +1302 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP Display::SetupInternalFramebuffer (ULONG depth)
+STDMETHODIMP Display::SetFramebuffer (ULONG aScreenId,
+    IFramebuffer *aFramebuffer)
 {
     LogFlowFunc (("\n"));
+
+    if (aFramebuffer != NULL)
+        CheckComArgOutPointerValid(aFramebuffer);
 
     AutoCaller autoCaller (this);
@@ -1353 +1315 @@
     AutoWriteLock alock (this);
 
-    /*
-     *  Create an internal framebuffer only if depth is not zero. Otherwise, we
-     *  reset back to the "black hole" state as it was at Display construction.
-     */
-    ComPtr <IFramebuffer> frameBuf;
-    if (depth)
-    {
-        ComObjPtr <InternalFramebuffer> internal;
-        internal.createObject();
-        internal->init (640, 480, depth);
-        frameBuf = internal; // query interface
-    }
-
     Console::SafeVMPtrQuiet pVM (mParent);
     if (pVM.isOk())
     {
-        /* Must leave the lock here because the changeFramebuffer will also obtain it. */
+        /* Must leave the lock here because the changeFramebuffer will
+         * also obtain it. */
         alock.leave ();
 
@@ -1375 +1325 @@
         PVMREQ pReq = NULL;
         int vrc = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-                               (PFNRT) changeFramebuffer, 4,
-                               this, static_cast <IFramebuffer *> (frameBuf),
-                               true /* aInternal */, VBOX_VIDEO_PRIMARY_SCREEN);
+            (PFNRT) changeFramebuffer, 3, this, aFramebuffer, aScreenId);
         if (RT_SUCCESS (vrc))
             vrc = pReq->iStatus;
@@ -1389 +1337 @@
     {
         /* No VM is created (VM is powered off), do a direct call */
-        int vrc = changeFramebuffer (this, frameBuf, true /* aInternal */, VBOX_VIDEO_PRIMARY_SCREEN);
-        ComAssertRCRet (vrc, E_FAIL);
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP Display::LockFramebuffer (BYTE **address)
-{
-    CheckComArgOutPointerValid(address);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
-    /* only allowed for internal framebuffers */
-    if (mInternalFramebuffer && !mFramebufferOpened
-        && !maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer.isNull())
-    {
-        CHECK_CONSOLE_DRV (mpDrv);
-
-        maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer->Lock();
-        mFramebufferOpened = true;
-        *address = mpDrv->Connector.pu8Data;
-        return S_OK;
-    }
-
-    return setError (VBOX_E_NOT_SUPPORTED,
-        tr ("Framebuffer locking is allowed only for the internal framebuffer"));
-}
-
-STDMETHODIMP Display::UnlockFramebuffer()
-{
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
-    if (mFramebufferOpened)
-    {
-        CHECK_CONSOLE_DRV (mpDrv);
-
-        maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer->Unlock();
-        mFramebufferOpened = false;
-        return S_OK;
-    }
-
-    return setError (VBOX_E_NOT_SUPPORTED,
-        tr ("Framebuffer locking is allowed only for the internal framebuffer"));
-}
-
-STDMETHODIMP Display::RegisterExternalFramebuffer (IFramebuffer *frameBuf)
-{
-    LogFlowFunc (("\n"));
-
-    CheckComArgNotNull(frameBuf);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
-    Console::SafeVMPtrQuiet pVM (mParent);
-    if (pVM.isOk())
-    {
-        /* Must leave the lock here because the changeFramebuffer will
-         * also obtain it. */
-        alock.leave ();
-
-        /* send request to the EMT thread */
-        PVMREQ pReq = NULL;
-        int vrc = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-            (PFNRT) changeFramebuffer, 4, this, frameBuf, false /* aInternal */,
-            VBOX_VIDEO_PRIMARY_SCREEN);
-        if (RT_SUCCESS (vrc))
-            vrc = pReq->iStatus;
-        VMR3ReqFree (pReq);
-
-        alock.enter ();
-
-        ComAssertRCRet (vrc, E_FAIL);
-    }
-    else
-    {
-        /* No VM is created (VM is powered off), do a direct call */
-        int vrc = changeFramebuffer (this, frameBuf, false /* aInternal */,
-            VBOX_VIDEO_PRIMARY_SCREEN);
-        ComAssertRCRet (vrc, E_FAIL);
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP Display::SetFramebuffer (ULONG aScreenId,
-    IFramebuffer *aFramebuffer)
-{
-    LogFlowFunc (("\n"));
-
-    CheckComArgOutPointerValid(aFramebuffer);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
-    Console::SafeVMPtrQuiet pVM (mParent);
-    if (pVM.isOk())
-    {
-        /* Must leave the lock here because the changeFramebuffer will
-         * also obtain it. */
-        alock.leave ();
-
-        /* send request to the EMT thread */
-        PVMREQ pReq = NULL;
-        int vrc = VMR3ReqCall (pVM, VMCPUID_ANY, &pReq, RT_INDEFINITE_WAIT,
-            (PFNRT) changeFramebuffer, 4, this, aFramebuffer, false /* aInternal */,
-            aScreenId);
-        if (RT_SUCCESS (vrc))
-            vrc = pReq->iStatus;
-        VMR3ReqFree (pReq);
-
-        alock.enter ();
-
-        ComAssertRCRet (vrc, E_FAIL);
-    }
-    else
-    {
-        /* No VM is created (VM is powered off), do a direct call */
-        int vrc = changeFramebuffer (this, aFramebuffer, false /* aInternal */,
-            aScreenId);
+        int vrc = changeFramebuffer (this, aFramebuffer, aScreenId);
         ComAssertRCRet (vrc, E_FAIL);
     }
@@ -1823 +1641 @@
 
     /* this is only valid for external framebuffers */
-    if (mInternalFramebuffer)
+    if (maFramebuffers[aScreenId].pFramebuffer == NULL)
         return setError (VBOX_E_NOT_SUPPORTED,
             tr ("Resize completed notification is valid only "
@@ -1859 +1677 @@
 
     /* this is only valid for external framebuffers */
-    if (mInternalFramebuffer)
+    if (maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer == NULL)
         return setError (VBOX_E_NOT_SUPPORTED,
             tr ("Resize completed notification is valid only "
                 "for external framebuffers"));
-
-    maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer->Lock();
-    /* signal our semaphore */
-    RTSemEventMultiSignal(mUpdateSem);
-    maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer->Unlock();
 
     return S_OK;
@@ -1972 +1785 @@
 /* static */
 DECLCALLBACK(int) Display::changeFramebuffer (Display *that, IFramebuffer *aFB,
-                                              bool aInternal, unsigned uScreenId)
+                                              unsigned uScreenId)
 {
     LogFlowFunc (("uScreenId = %d\n", uScreenId));
 
     AssertReturn (that, VERR_INVALID_PARAMETER);
-    AssertReturn (aFB || aInternal, VERR_INVALID_PARAMETER);
     AssertReturn (uScreenId < that->mcMonitors, VERR_INVALID_PARAMETER);
 
@@ -1987 +1799 @@
     DISPLAYFBINFO *pDisplayFBInfo = &that->maFramebuffers[uScreenId];
     pDisplayFBInfo->pFramebuffer = aFB;
-
-    that->mInternalFramebuffer = aInternal;
-    that->mSupportedAccelOps = 0;
 
     that->mParent->consoleVRDPServer()->SendResize ();