Changeset 54114 in vbox

Timestamp:

Feb 9, 2015 2:58:30 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt, Main: 7678: Do not log the improper call to 3D-overlay rescaling when 3D is not enabled/allowed for the running VM; Assert instead.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (3 diffs)
• Main/src-client/DisplayImpl.cpp (modified) (1 diff)

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

@@ -176 +176 @@
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
     frameBuffer()->setScaleFactor(dScaleFactor);
-    display().NotifyScaleFactorChange(m_uScreenId,
-                                      (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
-                                      (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
+    /* 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));
+    }
 
     /* Take unscaled HiDPI output mode into account: */
@@ -363 +367 @@
     const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
     frameBuffer()->setScaleFactor(dScaleFactor);
-    display().NotifyScaleFactorChange(m_uScreenId,
-                                      (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
-                                      (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
+    /* 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));
+    }
 
     /* Handle scale attributes change: */
@@ -548 +556 @@
         const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
         m_pFrameBuffer->setScaleFactor(dScaleFactor);
-        display().NotifyScaleFactorChange(m_uScreenId,
-                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
-                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
+        /* 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

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

@@ -3542 +3542 @@
     }
     else
-        LogRel(("Attempt to specify OpenGL content scale factor while 3D acceleration is disabled in VM config. Ignored.\n"));
+        AssertMsgFailed(("Attempt to specify OpenGL content scale factor while 3D acceleration is disabled in VM config. Ignored.\n"));
 
     return hr;
 #else
-    LogRel(("Attempt to specify OpenGL content scale factor while corresponding functionality is disabled."));
+    AssertMsgFailed(("Attempt to specify OpenGL content scale factor while corresponding functionality is disabled."));
     return E_UNEXPECTED;
 #endif /* VBOX_WITH_HGCM && VBOX_WITH_CROGL */