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

Timestamp:

Jun 8, 2021 12:34:08 AM (4 years ago)

Author:

vboxsync

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

144967

Message:

FE/Qt: bugref:8421: UIVideoMemoryEditor: Rework VRAM requirements to cover more side cases.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp

@@ -272 +272 @@
         return;
 
-    /* Get monitors count and base video memory requirements: */
-    quint64 uNeedMBytes = UICommon::requiredVideoMemory(m_comGuestOSType.GetId(), m_cGuestScreenCount) / _1M;
-
-    /* Initial value: */
+    /* Init visible maximum VRAM: */
     m_iMaxVRAMVisible = m_cGuestScreenCount * 32;
 
-    /* No more than m_iMaxVRAM: */
-    if (m_iMaxVRAMVisible > m_iMaxVRAM)
-        m_iMaxVRAMVisible = m_iMaxVRAM;
-
-    /* No less than 128MB (if possible): */
+    /* Get monitors count and recommended VRAM: */
+    int iNeedMBytes = UICommon::requiredVideoMemory(m_comGuestOSType.GetId(), m_cGuestScreenCount) / _1M;
+    /* Adjust visible maximum VRAM to be no less than 128MB (if possible): */
     if (m_iMaxVRAMVisible < 128 && m_iMaxVRAM >= 128)
         m_iMaxVRAMVisible = 128;
 
-    /* No less than initial VRAM size (wtf?): */
-    if (m_iMaxVRAMVisible < m_iInitialVRAM)
-        m_iMaxVRAMVisible = m_iInitialVRAM;
-
 #ifdef VBOX_WITH_3D_ACCELERATION
     if (m_f3DAccelerationEnabled && m_f3DAccelerationSupported)
     {
-        uNeedMBytes = qMax(uNeedMBytes, (quint64)128);
-        /* No less than 256MB (if possible): */
+        /* Adjust recommended VRAM to be no less than 128MB: */
+        iNeedMBytes = qMax(iNeedMBytes, 128);
+        /* Adjust visible maximum VRAM to be no less than 256MB (if possible): */
         if (m_iMaxVRAMVisible < 256 && m_iMaxVRAM >= 256)
             m_iMaxVRAMVisible = 256;
     }
 #endif
+
+    /* Adjust visible maximum VRAM to be no less than initial VRAM: */
+    m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, m_iInitialVRAM);
+    /* Adjust visible maximum VRAM to be no less than recommended VRAM: */
+    m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, iNeedMBytes);
+
+    /* Adjust recommended VRAM to be no more than actual maximum VRAM: */
+    iNeedMBytes = qMin(iNeedMBytes, m_iMaxVRAM);
+    /* Adjust visible maximum VRAM to be no more than actual maximum VRAM: */
+    m_iMaxVRAMVisible = qMin(m_iMaxVRAMVisible, m_iMaxVRAM);
 
     if (m_pSpinBox)
@@ -306 +308 @@
         m_pSlider->setMaximum(m_iMaxVRAMVisible);
         m_pSlider->setPageStep(calculatePageStep(m_iMaxVRAMVisible));
-        m_pSlider->setWarningHint(1, qMin((int)uNeedMBytes, m_iMaxVRAMVisible));
-        m_pSlider->setOptimalHint(qMin((int)uNeedMBytes, m_iMaxVRAMVisible), m_iMaxVRAMVisible);
+        m_pSlider->setWarningHint(1, qMin(iNeedMBytes, m_iMaxVRAMVisible));
+        m_pSlider->setOptimalHint(qMin(iNeedMBytes, m_iMaxVRAMVisible), m_iMaxVRAMVisible);
     }
     if (m_pLabelMemoryMax)