Changeset 54603 in vbox for trunk/src/VBox

Timestamp:

Mar 3, 2015 5:30:55 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 6278: Adding 3D API calls for the Unscaled HiDPI Output Mode.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (8 diffs)
• scale/UIMachineViewScale.cpp (modified) (1 diff)

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

@@ -173 +173 @@
 void UIMachineView::applyMachineViewScaleFactor()
 {
-    /* Take the scale-factor into account: */
+    /* Take the scale-factor related attributes into account: */
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
+    const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
     frameBuffer()->setScaleFactor(dScaleFactor);
-    /* Propagate scale-factor to 3D service if necessary: */
+    frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
+    /* Propagate the scale-factor related attributes to 3D service if necessary: */
     if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
     {
@@ -182 +184 @@
                                           (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
                                           (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
-    }
-
-    /* Take unscaled HiDPI output mode into account: */
-    const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
-    frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
+        display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
+    }
 
     /* Perform frame-buffer rescaling: */
     frameBuffer()->performRescale();
+
+    // TODO: How to make it work?
+    display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }
 
@@ -367 +369 @@
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
     frameBuffer()->setScaleFactor(dScaleFactor);
-    /* Propagate scale-factor to 3D service if necessary: */
+    /* Propagate the scale-factor to 3D service if necessary: */
     if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
     {
@@ -383 +385 @@
     updateScaledPausePixmap();
     viewport()->update();
+
+    // TODO: How to make it work?
+    display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }
 
@@ -391 +396 @@
         return;
 
-    /* Take unscaled HiDPI output mode into account: */
+    /* Take the unscaled HiDPI output mode into account: */
     const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
+    /* Propagate the unscaled HiDPI output mode to 3D service if necessary: */
+    if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
+    {
+        display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
+    }
 
     /* Handle scale attributes change: */
@@ -403 +413 @@
     updateScaledPausePixmap();
     viewport()->update();
+
+    // TODO: How to make it work?
+    display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }
 
@@ -539 +552 @@
         m_pFrameBuffer->setHiDPIOptimizationType(uisession()->hiDPIOptimizationType());
 
-        /* Take scale-factor into account: */
-        const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
-        m_pFrameBuffer->setScaleFactor(dScaleFactor);
-        /* Propagate scale-factor to 3D service if necessary: */
-        if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
-        {
-            display().NotifyScaleFactorChange(m_uScreenId,
-                                              (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
-                                              (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
-        }
-
 #ifdef Q_WS_MAC
         /* Take backing scale-factor into account: */
@@ -555 +557 @@
 #endif /* Q_WS_MAC */
 
-        /* Take unscaled HiDPI output mode into account: */
+        /* Take the scale-factor related attributes into account: */
+        const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
         const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
+        m_pFrameBuffer->setScaleFactor(dScaleFactor);
         m_pFrameBuffer->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
+        /* Propagate the scale-factor related attributes to 3D service if necessary: */
+        if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
+        {
+            display().NotifyScaleFactorChange(m_uScreenId,
+                                              (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+                                              (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
+            display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
+        }
 
         /* Perform frame-buffer rescaling: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -148 +148 @@
     const bool fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(vboxGlobal().managedVMUuid());
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
+    /* Propagate unscaled-hidpi-output feature to 3D service if necessary: */
+    if (machine().GetAccelerate3DEnabled() && vboxGlobal().is3DAvailable())
+    {
+        display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
+    }
 
     /* Perform frame-buffer rescaling: */
     frameBuffer()->performRescale();
+
+    // TODO: How to make it work?
+    display().ViewportChanged(screenId(), contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }