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

Timestamp:

Jul 15, 2016 11:38:53 AM (9 years ago)

Author:

vboxsync

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

108793

Message:

FE/Qt: removed some dead / wrong code for determining the suggested amount of VRAM

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -3685 +3685 @@
 #ifdef VBOX_WITH_CRHGSMI
 /* static */
-quint64 VBoxGlobal::required3DWddmOffscreenVideoMemory(const QString &strGuestOSTypeId, int cMonitors /* = 1 */)
-{
-    cMonitors = RT_MAX(cMonitors, 1);
-    quint64 cbSize = VBoxGlobal::requiredVideoMemory(strGuestOSTypeId, 1); /* why not cMonitors? */
-    cbSize += 64 * _1M;
-    return cbSize;
-}
-
-/* static */
 bool VBoxGlobal::isWddmCompatibleOsType(const QString &strGuestOSTypeId)
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -458 +458 @@
 #ifdef VBOX_WITH_CRHGSMI
     static bool isWddmCompatibleOsType(const QString &strGuestOSTypeId);
-    static quint64 required3DWddmOffscreenVideoMemory(const QString &strGuestOSTypeId, int cMonitors = 1);
 #endif /* VBOX_WITH_CRHGSMI */
 

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

@@ -373 +373 @@
             else if (m_pCheckbox3D->isChecked() && m_fWddmModeSupported)
             {
-# if 0
-                int cGuestScreenCount = m_pEditorVideoScreenCount->value();
-                uNeedBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cGuestScreenCount);
-                uNeedBytes = qMin(uNeedBytes, 256 * _1M);
-# endif
                 uNeedBytes = qMax(uNeedBytes, (quint64) 128 * _1M);
                 if ((quint64)m_pEditorVideoMemorySize->value() * _1M < uNeedBytes)
@@ -960 +955 @@
     if (m_pCheckbox3D->isChecked() && m_fWddmModeSupported)
     {
-# if 0
-        uNeedMBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cGuestScreenCount) / _1M;
-        uNeedMBytes = qMin(uNeedMBytes, 256);
-# endif
         uNeedMBytes = qMax(uNeedMBytes, (quint64) 128);
         /* No less than 256MB (if possible): */