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

Timestamp:

Jun 1, 2016 6:07:40 PM (9 years ago)

Author:

vboxsync

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

107692

Message:

FE/Qt: bugref:8376: VM settings dialog: Display page: Restore CRHGSMI warning for insufficient VRAM amount (128MB for now) of WDDM supporting OS.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -369 +369 @@
             }
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-#if 0
-# ifdef VBOX_WITH_CRHGSMI
+#ifdef VBOX_WITH_CRHGSMI
             /* 3D acceleration video RAM amount test: */
             else if (m_pCheckbox3D->isChecked() && m_fWddmModeSupported)
             {
+# if 0
                 int cGuestScreenCount = m_pEditorVideoScreenCount->value();
                 uNeedBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cGuestScreenCount);
-                uNeedBytes = qMax(uNeedBytes, 128 * _1M);
                 uNeedBytes = qMin(uNeedBytes, 256 * _1M);
+# endif
+                uNeedBytes = qMax(uNeedBytes, (quint64) 128 * _1M);
                 if ((quint64)m_pEditorVideoMemorySize->value() * _1M < uNeedBytes)
                 {
@@ -386 +387 @@
                 }
             }
-# endif /* VBOX_WITH_CRHGSMI */
-#endif /* 0 */
+#endif /* VBOX_WITH_CRHGSMI */
         }
 
@@ -962 +962 @@
 # if 0
         uNeedMBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cGuestScreenCount) / _1M;
-        uNeedMBytes = qMax(uNeedMBytes, 128);
         uNeedMBytes = qMin(uNeedMBytes, 256);
 # endif
+        uNeedMBytes = qMax(uNeedMBytes, (quint64) 128);
         /* No less than 256MB (if possible): */
         if (m_iMaxVRAMVisible < 256 && m_iMaxVRAM >= 256)