Changeset 27758 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 26, 2010 6:51:00 PM (15 years ago)

Author:

vboxsync

Message:

2d: better cleanup, bugfixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.h (modified) (5 diffs)
• runtime/UIMachineView.cpp (modified) (2 diffs)
• runtime/UISession.cpp (modified) (2 diffs)

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

@@ -1429 +1429 @@
 public:
     VBoxFBSizeInfo() {}
-    template<class T> VBoxFBSizeInfo(T * e) :
-        mPixelFormat(e->pixelFormat()), mVRAM(e->VRAM()), mBitsPerPixel(e->bitsPerPixel()),
-        mBytesPerLine(e->bytesPerLine()), mWidth(e->width()), mHeight(e->height()) {}
+    template<class T> VBoxFBSizeInfo(T * fb) :
+        mPixelFormat(fb->pixelFormat()), mVRAM(fb->address()), mBitsPerPixel(fb->bitsPerPixel()),
+        mBytesPerLine(fb->bytesPerLine()), mWidth(fb->width()), mHeight(fb->height()),
+        mUsesGuestVram(fb->usesGuestVRAM()) {}
 
     VBoxFBSizeInfo(ulong aPixelFormat, uchar *aVRAM,
                      ulong aBitsPerPixel, ulong aBytesPerLine,
-                     ulong aWidth, ulong aHeight) :
+                     ulong aWidth, ulong aHeight,
+                     bool bUsesGuestVram) :
         mPixelFormat (aPixelFormat), mVRAM (aVRAM), mBitsPerPixel (aBitsPerPixel),
-        mBytesPerLine (aBytesPerLine), mWidth (aWidth), mHeight (aHeight) {}
+        mBytesPerLine (aBytesPerLine), mWidth (aWidth), mHeight (aHeight),
+        mUsesGuestVram(bUsesGuestVram) {}
     ulong pixelFormat() const { return mPixelFormat; }
     uchar *VRAM() const { return mVRAM; }
@@ -1444 +1447 @@
     ulong width() const { return mWidth; }
     ulong height() const { return mHeight; }
+    bool usesGuestVram() const {return mUsesGuestVram;}
 
 private:
@@ -1452 +1456 @@
     ulong mWidth;
     ulong mHeight;
+    bool mUsesGuestVram;
 };
 
@@ -1908 +1913 @@
           mOverlay(pView->viewport(), pView, aSession),
           mpView (pView)
-    {}
+    {
+        /* synch with framebuffer */
+        mOverlay.onResizeEventPostprocess (VBoxFBSizeInfo(this), QPoint(mpView->contentsX(), mpView->contentsY()));
+    }
 
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand)
@@ -1949 +1957 @@
     {
         T::resizeEvent (re);
-        mOverlay.onResizeEventPostprocess (VBoxFBSizeInfo(re),
+        mOverlay.onResizeEventPostprocess (VBoxFBSizeInfo(this),
                 QPoint(mpView->contentsX(), mpView->contentsY()));
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -527 +527 @@
 # endif
 # if defined(VBOX_WITH_VIDEOHWACCEL) && defined(DEBUG_misha) /* not tested yet */
-            /* these two additional template args is a workaround to this [VBox|UI] duplication
-             * @todo: they are to be removed once VBox stuff is gone */
-            m_pFrameBuffer = m_fAccelerate2DVideo ? new VBoxOverlayFrameBuffer<UIFrameBufferSDL, UIMachineView, UIResizeEvent> (this, &machineWindowWrapper()->session()) : new UIFrameBufferSDL(this);
+            if (m_fAccelerate2DVideo)
+            {
+                class UIFrameBuffer* pFramebuffer = uisession()->persistedBrameBuffer(screenId());
+                if (pFramebuffer)
+                    pFramebuffer->setView(this);
+                else
+                {
+                    /* these two additional template args is a workaround to this [VBox|UI] duplication
+                     * @todo: they are to be removed once VBox stuff is gone */
+                    pFramebuffer = new VBoxOverlayFrameBuffer<UIFrameBufferSDL, UIMachineView, UIResizeEvent>(this, &machineWindowWrapper()->session());
+                    uisession()->setPersistedBrameBuffer(screenId(), pFramebuffer);
+                }
+                m_pFrameBuffer = pFramebuffer;
+            }
+            else
+                m_pFrameBuffer = new UIFrameBufferSDL(this);
 # else
             m_pFrameBuffer = new UIFrameBufferSDL(this);
@@ -557 +570 @@
             viewport()->setAttribute(Qt::WA_PaintOnScreen);
 # ifdef VBOX_WITH_VIDEOHWACCEL
-            /* these two additional template args is a workaround to this [VBox|UI] duplication
-             * @todo: they are to be removed once VBox stuff is gone */
-            m_pFrameBuffer = m_fAccelerate2DVideo ? new VBoxOverlayFrameBuffer<UIFrameBufferQuartz2D, UIMachineView, UIResizeEvent>(this, &machineWindowWrapper()->session()) : new UIFrameBufferQuartz2D(this);
+            if (m_fAccelerate2DVideo)
+            {
+                class UIFrameBuffer* pFramebuffer = uisession()->persistedBrameBuffer(screenId());
+                if (pFramebuffer)
+                    pFramebuffer->setView(this);
+                else
+                {
+                    /* these two additional template args is a workaround to this [VBox|UI] duplication
+                     * @todo: they are to be removed once VBox stuff is gone */
+                    pFramebuffer = new VBoxOverlayFrameBuffer<UIFrameBufferQuartz2D, UIMachineView, UIResizeEvent>(this, &machineWindowWrapper()->session());
+                    uisession()->setPersistedBrameBuffer(screenId(), pFramebuffer);
+                }
+                m_pFrameBuffer = pFramebuffer;
+            }
+            else
+                m_pFrameBuffer = new UIFrameBufferQuartz2D(this);
 # else
             m_pFrameBuffer = new UIFrameBufferQuartz2D(this);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -38 +38 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
 # include "VBoxFBOverlay.h"
+# include "UIFrameBuffer.h"
 #endif
 
@@ -594 +595 @@
         DestroyIcon(m_alphaCursor);
 #endif
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    for (int i = m_FrameBufferVector.size() - 1; i >= 0; --i)
+    {
+        UIFrameBuffer *pFb = m_FrameBufferVector[i];
+        if (pFb)
+        {
+            /* Warn framebuffer about its no more necessary: */
+            pFb->setDeleted(true);
+            /* Detach framebuffer from Display: */
+            CDisplay display = session().GetConsole().GetDisplay();
+            display.SetFramebuffer(i, CFramebuffer(NULL));
+            /* Release the reference: */
+            pFb->Release();
+        }
+    }
+#endif
 }