Changeset 51552 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 5, 2014 12:33:13 PM (11 years ago)

Author:

vboxsync

Message:

Main: removed obsolete GetFramebuffer, updateDisplayData methods.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (3 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -193 +193 @@
     int notifyCroglResize(const PVBVAINFOVIEW pView, const PVBVAINFOSCREEN pScreen, void *pvVRAM);
 
-    IFramebuffer *getFramebuffer()
-    {
-        return maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer;
-    }
     void getFramebufferDimensions(int32_t *px1, int32_t *py1, int32_t *px2, int32_t *py2);
     int getScreenResolution(uint32_t cScreen, ULONG *pcx, ULONG *pcy,
@@ -229 +225 @@
     STDMETHOD(QueryFramebuffer)(ULONG aScreenId,
                                 IFramebuffer **aFramebuffer);
-    STDMETHOD(GetFramebuffer)(ULONG aScreenId, IFramebuffer **aFramebuffer, LONG *aXOrigin, LONG *aYOrigin);
     STDMETHOD(SetVideoModeHint)(ULONG aDisplay, BOOL aEnabled, BOOL aChangeOrigin, LONG aOriginX, LONG aOriginY, ULONG aWidth, ULONG aHeight, ULONG aBitsPerPixel);
     STDMETHOD(TakeScreenShot)(ULONG aScreenId, BYTE *address, ULONG width, ULONG height);
@@ -250 +245 @@
     HRESULT querySourceBitmap(ULONG aScreenId,
                               IDisplaySourceBitmap **ppDisplaySourceBitmap);
-    int updateDisplayData(void);
 
 #ifdef VBOX_WITH_CRHGSMI

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -7366 +7366 @@
         LogFlowThisFunc(("Stopping VRDP server...\n"));
 
-        /* Leave the lock since EMT will call us back as addVMCaller()
-         * in updateDisplayData(). */
+        /* Leave the lock since EMT could call us back as addVMCaller() */
         alock.release();
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -2527 +2527 @@
     if (mpDrv)
     {
-        /* Setup the new framebuffer, the resize will lead to an updateDisplayData call. */
+        /* Setup the new framebuffer. */
 
 #if defined(VBOX_WITH_CROGL)
@@ -2624 +2624 @@
     if (!pFBInfo->pFramebuffer.isNull())
         pFBInfo->pFramebuffer->AddRef();
-
-    return S_OK;
-}
-
-STDMETHODIMP Display::GetFramebuffer(ULONG aScreenId,
-                                     IFramebuffer **aFramebuffer, LONG *aXOrigin, LONG *aYOrigin)
-{
-    LogRelFlowFunc(("aScreenId=%ld\n", aScreenId));
-
-    CheckComArgOutPointerValid(aFramebuffer);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (aScreenId != 0 && aScreenId >= mcMonitors)
-        return E_INVALIDARG;
-
-    /** @todo This should be actually done on EMT. */
-    DISPLAYFBINFO *pFBInfo = &maFramebuffers[aScreenId];
-    AssertPtr(pFBInfo);
-
-    *aFramebuffer = pFBInfo->pFramebuffer; /** @todo r=andy Race prone? Use a ComPtr instead? */
-    if (*aFramebuffer)
-        (*aFramebuffer)->AddRef();
-    if (aXOrigin)
-        *aXOrigin = pFBInfo->xOrigin;
-    if (aYOrigin)
-        *aYOrigin = pFBInfo->yOrigin;
 
     return S_OK;
@@ -3779 +3749 @@
 }
 
-/**
- *  Helper to update the display information from the framebuffer.
- *
- *  @thread EMT
- */
-int Display::updateDisplayData(void)
-{
-    LogRelFlowFunc(("\n"));
-
-    /* the driver might not have been constructed yet */
-    if (!mpDrv)
-        return VINF_SUCCESS;
-
-#ifdef VBOX_STRICT
-    /*
-     *  Sanity check. Note that this method may be called on EMT after Console
-     *  has started the power down procedure (but before our #drvDestruct() is
-     *  called, in which case pVM will already be NULL but mpDrv will not). Since
-     *  we don't really need pVM to proceed, we avoid this check in the release
-     *  build to save some ms (necessary to construct SafeVMPtrQuiet) in this
-     *  time-critical method.
-     */
-    Console::SafeVMPtrQuiet ptrVM(mParent);
-    if (ptrVM.isOk())
-    {
-        PVM pVM = VMR3GetVM(ptrVM.rawUVM());
-        Assert(VM_IS_EMT(pVM));
-    }
-#endif
-
-    /* The method is only relevant to the primary framebuffer. */
-    IFramebuffer *pFramebuffer = maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer;
-
-    if (pFramebuffer)
-    {
-        HRESULT rc;
-        BYTE *address = 0;
-        rc = pFramebuffer->COMGETTER(Address) (&address);
-        AssertComRC (rc);
-        ULONG bytesPerLine = 0;
-        rc = pFramebuffer->COMGETTER(BytesPerLine) (&bytesPerLine);
-        AssertComRC (rc);
-        ULONG bitsPerPixel = 0;
-        rc = pFramebuffer->COMGETTER(BitsPerPixel) (&bitsPerPixel);
-        AssertComRC (rc);
-        ULONG width = 0;
-        rc = pFramebuffer->COMGETTER(Width) (&width);
-        AssertComRC (rc);
-        ULONG height = 0;
-        rc = pFramebuffer->COMGETTER(Height) (&height);
-        AssertComRC (rc);
-
-        if (   (width  != mLastWidth  && mLastWidth != 0)
-            || (height != mLastHeight && mLastHeight != 0))
-        {
-            LogRel(("updateDisplayData: size mismatch w %d(%d) h %d(%d)\n",
-                    width, mLastWidth, height, mLastHeight));
-            return VERR_INVALID_STATE;
-        }
-
-        mpDrv->IConnector.pu8Data = (uint8_t *) address;
-        mpDrv->IConnector.cbScanline = bytesPerLine;
-        mpDrv->IConnector.cBits = bitsPerPixel;
-        mpDrv->IConnector.cx = width;
-        mpDrv->IConnector.cy = height;
-    }
-    else
-    {
-        /* black hole */
-        mpDrv->IConnector.pu8Data = NULL;
-        mpDrv->IConnector.cbScanline = 0;
-        mpDrv->IConnector.cBits = 0;
-        mpDrv->IConnector.cx = 0;
-        mpDrv->IConnector.cy = 0;
-    }
-    LogRelFlowFunc(("leave\n"));
-    return VINF_SUCCESS;
-}
-
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
 int Display::crViewportNotify(ULONG aScreenId, ULONG x, ULONG y, ULONG width, ULONG height)
@@ -3969 +3860 @@
     if (that->mpDrv)
     {
-        /* Setup the new framebuffer, the resize will lead to an updateDisplayData call. */
+        /* Setup the new framebuffer. */
         DISPLAYFBINFO *pFBInfo = &that->maFramebuffers[uScreenId];