Changeset 53964 in vbox

Timestamp:

Jan 26, 2015 7:04:59 PM (10 years ago)

Author:

vboxsync

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

97863

Message:

FE/Qt: 3635: 2D Video Acceleration support for Scaling mode: Update routine bug-fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (4 diffs)
• VBoxFBOverlay.h (modified) (4 diffs)
• runtime/UIFrameBuffer.cpp (modified) (2 diffs)
• runtime/UIFrameBuffer.h (modified) (2 diffs)

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

@@ -53 +53 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+/* Other VBox includes: */
 #include <iprt/memcache.h>
 #include <VBox/err.h>
-
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -61 +61 @@
 # include <VBox/vmm/ssm.h>
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+
+/* Other includes: */
+#include <math.h>
+
 
 #ifdef VBOXQGL_PROF_BASE
@@ -4415 +4419 @@
 {
     /* Prepare corresponding viewport part: */
-    QRect rect;
-
-    /* Take the scale-factor into account: */
+    QRect rect(uX, uY, uW, uH);
+
+    /* Take the scaling into account: */
     const double dScaleFactor = mSizeInfo.scaleFactor();
-    if (dScaleFactor == 1.0)
-    {
+    const QSize scaledSize = mSizeInfo.scaledSize();
+    if (scaledSize.isValid())
+    {
+        /* Calculate corresponding scale-factors: */
+        const double xScaleFactor = mSizeInfo.visualState() == UIVisualStateType_Scale ?
+                                    (double)scaledSize.width()  / mSizeInfo.width()  : dScaleFactor;
+        const double yScaleFactor = mSizeInfo.visualState() == UIVisualStateType_Scale ?
+                                    (double)scaledSize.height() / mSizeInfo.height() : dScaleFactor;
         /* Adjust corresponding viewport part: */
-        rect.moveTo(uX, uY);
-        rect.setSize(QSize(uW, uH));
-    }
-    else
-    {
-        /* Adjust corresponding viewport part: */
-        rect.moveTo(uX * dScaleFactor - 1,
-                    uY * dScaleFactor - 1);
-        rect.setSize(QSize(uW * dScaleFactor + 2 * dScaleFactor + 1,
-                           uH * dScaleFactor + 2 * dScaleFactor + 1));
+        rect.moveTo(floor((double)rect.x() * xScaleFactor) - 1,
+                    floor((double)rect.y() * yScaleFactor) - 1);
+        rect.setSize(QSize(ceil((double)rect.width()  * xScaleFactor) + 2,
+                           ceil((double)rect.height() * yScaleFactor) + 2));
     }
 
@@ -4441 +4445 @@
         if (dBackingScaleFactor > 1.0)
         {
-            rect.moveTo(rect.topLeft() / dBackingScaleFactor - QPoint(1, 1));
-            rect.setSize(rect.size() / dBackingScaleFactor + QSize(2, 2));
+            rect.moveTo(floor((double)rect.x() / dBackingScaleFactor) - 1,
+                        floor((double)rect.y() / dBackingScaleFactor) - 1);
+            rect.setSize(QSize(ceil((double)rect.width()  / dBackingScaleFactor) + 2,
+                               ceil((double)rect.height() / dBackingScaleFactor) + 2));
         }
     }

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

@@ -1344 +1344 @@
     VBoxFBSizeInfo() {}
     template<class T> VBoxFBSizeInfo(T *pFb) :
+        m_visualState(pFb->visualState()),
         mPixelFormat(pFb->pixelFormat()), mVRAM(pFb->address()), mBitsPerPixel(pFb->bitsPerPixel()),
         mBytesPerLine(pFb->bytesPerLine()), mWidth(pFb->width()), mHeight(pFb->height()),
@@ -1353 +1354 @@
                    ulong aWidth, ulong aHeight,
                    bool bUsesGuestVram) :
+        m_visualState(UIVisualStateType_Invalid),
         mPixelFormat(aPixelFormat), mVRAM(aVRAM), mBitsPerPixel(aBitsPerPixel),
         mBytesPerLine(aBytesPerLine), mWidth(aWidth), mHeight(aHeight),
@@ -1358 +1360 @@
         mUsesGuestVram(bUsesGuestVram) {}
 
+    UIVisualStateType visualState() const { return m_visualState; }
     ulong pixelFormat() const { return mPixelFormat; }
     uchar *VRAM() const { return mVRAM; }
@@ -1371 +1374 @@
 private:
 
+    UIVisualStateType m_visualState;
     ulong mPixelFormat;
     uchar *mVRAM;

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

@@ -56 +56 @@
 
 UIFrameBuffer::UIFrameBuffer()
-    : m_iWidth(0), m_iHeight(0)
+    : m_visualState(UIVisualStateType_Invalid)
+    , m_iWidth(0), m_iHeight(0)
     , m_pMachineView(NULL)
     , m_iWinId(0)
@@ -74 +75 @@
 {
     LogRel2(("UIFrameBuffer::init %p\n", this));
+
+    /* Fetch visual-state: */
+    m_visualState = pMachineView->visualStateType();
 
     /* Assign mahine-view: */

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

@@ -76 +76 @@
       * @note Calls to this and any other EMT callback are synchronized (from GUI side). */
     void setMarkAsUnused(bool fUnused);
+
+    /** Returns the visual-state this frame-buffer created for. */
+    UIVisualStateType visualState() const { return m_visualState; }
 
     /** Returns whether frame-buffer is <b>auto-enabled</b>.
@@ -260 +263 @@
                               HiDPIOptimizationType hiDPIOptimizationType,
                               double dBackingScaleFactor);
+
+    /** Holds the visual-state this frame-buffer created for. */
+    UIVisualStateType m_visualState;
 
     /** Holds the QImage buffer. */