Changeset 51459 in vbox for trunk/src/VBox

Timestamp:

May 29, 2014 12:04:50 PM (11 years ago)

Author:

vboxsync

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

94029

Message:

FE/Qt: Runtime UI: Frame-buffer NotifyChange event handling cleanup #2.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.h (modified) (1 diff)
• runtime/UIFrameBuffer.cpp (modified) (1 diff)
• runtime/UIFrameBuffer.h (modified) (1 diff)
• runtime/UIFrameBufferQImage.cpp (modified) (3 diffs)
• runtime/UIFrameBufferQImage.h (modified) (2 diffs)
• runtime/UIFrameBufferQuartz2D.cpp (modified) (4 diffs)
• runtime/UIFrameBufferQuartz2D.h (modified) (2 diffs)

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

@@ -1343 +1343 @@
         mPixelFormat(fb->pixelFormat()), mVRAM(fb->address()), mBitsPerPixel(fb->bitsPerPixel()),
         mBytesPerLine(fb->bytesPerLine()), mWidth(fb->width()), mHeight(fb->height()),
-        mUsesGuestVram(fb->usesGuestVRAM()) {}
+        mUsesGuestVram(true) {}
 
     VBoxFBSizeInfo(ulong aPixelFormat, uchar *aVRAM,

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

@@ -169 +169 @@
     if (!pbUsesGuestVRAM)
         return E_POINTER;
-    *pbUsesGuestVRAM = usesGuestVRAM();
+    *pbUsesGuestVRAM = true;
     return S_OK;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h

@@ -186 +186 @@
     }
 
-    virtual bool usesGuestVRAM()
-    {
-        return false;
-    }
-
     void lock() const { RTCritSectEnter(&m_critSect); }
     void unlock() const { RTCritSectLeave(&m_critSect); }

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

@@ -126 +126 @@
             m_img = QImage((uchar *)pEvent->VRAM(), m_width, m_height, bitsPerLine / 8, format);
             m_uPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
-            m_bUsesGuestVRAM = true;
         }
     }
@@ -186 +185 @@
      * GUI didn't received event about that or didn't processed it yet. */
     KMachineState machineState = m_pMachineView->uisession()->session().GetConsole().GetState();
-    if (   m_bUsesGuestVRAM
-        /* running */
-        && machineState != KMachineState_Running
+    if (/* running */
+           machineState != KMachineState_Running
         && machineState != KMachineState_Teleporting
         && machineState != KMachineState_LiveSnapshotting
@@ -414 +412 @@
         m_img = QImage(pAddress, ulWidth, ulHeight, ulBytesPerLine, QImage::Format_RGB32);
         m_uPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
-        m_bUsesGuestVRAM = true;
-    }
-}
-
+    }
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.h

@@ -37 +37 @@
     /* API: Frame-buffer stuff: */
     ulong pixelFormat() { return m_uPixelFormat; }
-    bool usesGuestVRAM() { return m_bUsesGuestVRAM; }
     uchar *address() { return m_img.bits(); }
     ulong bitsPerPixel() { return m_img.depth(); }
@@ -65 +64 @@
     QImage m_img;
     ulong m_uPixelFormat;
-    bool m_bUsesGuestVRAM;
 };
 

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

@@ -50 +50 @@
 UIFrameBufferQuartz2D::UIFrameBufferQuartz2D(UIMachineView *pMachineView)
     : UIFrameBuffer(pMachineView)
-    , m_fUsesGuestVRAM(false)
     , m_pDataAddress(NULL)
     , m_pBitmapData(NULL)
@@ -201 +200 @@
         && aEvent->bitsPerPixel() == 32)
     {
-        m_fUsesGuestVRAM = true;
-//        printf ("VRAM\n");
         /* Create the image copy of the framebuffer */
         CGDataProviderRef dp = CGDataProviderCreateWithData(NULL, aEvent->VRAM(), aEvent->bytesPerLine() * m_height, NULL);
@@ -213 +210 @@
     else
     {
-        m_fUsesGuestVRAM = false;
         remind = true;
-//        printf ("No VRAM\n");
         /* Create the memory we need for our image copy
          * Read somewhere that an alignment of 16 is
@@ -247 +242 @@
      * the link between framebuffer and video memory
      * is broken, we should go fallback now... */
-    if (m_fUsesGuestVRAM &&
-        !m_pMachineView->uisession()->isRunning() &&
+    if (!m_pMachineView->uisession()->isRunning() &&
         !m_pMachineView->uisession()->isPaused() &&
         /* Online snapshotting: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.h

@@ -44 +44 @@
     ulong bytesPerLine() { return CGImageGetBytesPerRow(m_image); }
     ulong pixelFormat() { return m_uPixelFormat; };
-    bool usesGuestVRAM() { return m_pBitmapData == NULL; }
 
     const CGImageRef imageRef() const { return m_image; }
@@ -55 +54 @@
     void clean(bool fPreserveRegions);
 
-    bool m_fUsesGuestVRAM;
     uchar *m_pDataAddress;
     void *m_pBitmapData;