Changeset 33617 in vbox for trunk/src/VBox

Timestamp:

Oct 29, 2010 3:08:08 PM (14 years ago)

Author:

vboxsync

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

67228

Message:

wddm/3d: gui settings fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialogSpecific.cpp (modified) (1 diff)
• vm/VBoxVMSettingsDisplay.cpp (modified) (4 diffs)
• vm/VBoxVMSettingsDisplay.h (modified) (2 diffs)
• vm/VBoxVMSettingsGeneral.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -583 +583 @@
             qobject_cast<VBoxVMSettingsDisplay*>(m_pSelector->idToPage(VMSettingsPage_Display));
 #ifdef VBOX_WITH_CRHGSMI
-        if (pGeneralPage && pDisplayPage &&
-            pDisplayPage->isAcceleration3DSelected() && !pGeneralPage->isWddmSupportedForOSType())
-        {
-            int vramMb = pDisplayPage->getVramSizeMB();
-            int requiredVramMb = pDisplayPage->getMinVramSizeMBForWddm3D();
-            if (vramMb < requiredVramMb)
+        if (pGeneralPage && pDisplayPage)
+        {
+            bool bWddmSupported = pGeneralPage->isWddmSupportedForOSType();
+            pDisplayPage->setWddmMode(bWddmSupported);
+            if (pDisplayPage->isAcceleration3DSelected() && bWddmSupported)
             {
-                strWarning = tr(
-                    "you have 3D Acceleration enabled for OS type using the WDDM Video Driver. "
-                    "To make 3D work OK please set guest VRAM size to <b>%1</b>."
-                    ).arg (vboxGlobal().formatSize (requiredVramMb * _1M, 0, VBoxDefs::FormatSize_RoundUp));
-                return true;
+                int vramMb = pDisplayPage->getVramSizeMB();
+                int requiredVramMb = pDisplayPage->getMinVramSizeMBForWddm3D();
+                if (vramMb < requiredVramMb)
+                {
+                    strWarning = tr(
+                        "You have 3D Acceleration enabled for a operation system which uses the WDDM video driver. "
+                        "For maximal performance set the guest VRAM to at least <b>%1</b>."
+                        ).arg (vboxGlobal().formatSize (requiredVramMb * _1M, 0, VBoxDefs::FormatSize_RoundUp));
+                    return true;
+                }
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp

@@ -114 +114 @@
 #endif
 
+#ifdef VBOX_WITH_CRHGSMI
+    m_bWddmMode = false;
+#endif
+
     /* Applying language settings */
     retranslateUi();
@@ -139 +143 @@
 {
     return mSlMemory->value();
+}
+
+void VBoxVMSettingsDisplay::setWddmMode(bool bWddm)
+{
+    if (bWddm == m_bWddmMode)
+        return;
+
+    m_bWddmMode = bWddm;
+    checkMultiMonitorReqs();
 }
 #endif
@@ -223 +236 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     connect (mCb2DVideo, SIGNAL (stateChanged (int)),
-             mValidator, SLOT (revalidate()));
-#endif
-#ifdef VBOX_WITH_CRHGSMI
-    connect (mCb3D, SIGNAL (stateChanged (int)),
              mValidator, SLOT (revalidate()));
 #endif
@@ -345 +354 @@
     quint64 needMBytes = VBoxGlobal::requiredVideoMemory (&mMachine, cVal) / _1M;
     /* Limit the maximum memory to save careless users from setting useless big values */
-    m_maxVRAMVisible = cVal * 32;
-    if (m_maxVRAMVisible < 128)
-        m_maxVRAMVisible = 128;
-    if (m_maxVRAMVisible < m_initialVRAM)
-        m_maxVRAMVisible = m_initialVRAM;
+#ifdef VBOX_WITH_CRHGSMI
+    if (m_bWddmMode && mCb3D->isChecked())
+    {
+        m_maxVRAMVisible = 256;
+    }
+    else
+#endif
+    {
+        m_maxVRAMVisible = cVal * 32;
+        if (m_maxVRAMVisible < 128)
+            m_maxVRAMVisible = 128;
+        if (m_maxVRAMVisible < m_initialVRAM)
+            m_maxVRAMVisible = m_initialVRAM;
+    }
     mSlMemory->setWarningHint (1, needMBytes);
     mSlMemory->setPageStep (calcPageStep (m_maxVRAMVisible));

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.h

@@ -41 +41 @@
     int getMinVramSizeMBForWddm3D() const;
     int getVramSizeMB() const;
+    void setWddmMode(bool bWddm);
 #endif
 
@@ -78 +79 @@
     /* Initial VRAM value when the dialog is opened. */
     int m_initialVRAM;
+#ifdef VBOX_WITH_CRHGSMI
+    /* specifies whether the guest os is wddm-capable */
+    bool m_bWddmMode;
+#endif
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsGeneral.cpp

@@ -61 +61 @@
 
 #ifdef VBOX_WITH_CRHGSMI
+#include <stdio.h>
 bool VBoxVMSettingsGeneral::isWddmSupportedForOSType() const
 {
-    return mOSTypeSelector->type().GetId() == "Windows Vista"
-            || mOSTypeSelector->type().GetId() == "Windows 7";
+    const QString & id = mOSTypeSelector->type().GetId();
+    printf("%S\n", id.utf16());
+    bool bWddm = id == "WindowsVista" || id == "Windows7";
+    return bWddm;
 }
 #endif