Changeset 33599 in vbox

Timestamp:

Oct 29, 2010 11:14:14 AM (15 years ago)

Author:

vboxsync

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

67210

Message:

wddm/3d: VM settings GUI: display warnings about the VRAM size

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/settings/UISettingsDialogSpecific.cpp (modified) (3 diffs)
• src/settings/vm/VBoxVMSettingsDisplay.cpp (modified) (2 diffs)
• src/settings/vm/VBoxVMSettingsDisplay.h (modified) (1 diff)
• src/settings/vm/VBoxVMSettingsGeneral.cpp (modified) (1 diff)
• src/settings/vm/VBoxVMSettingsGeneral.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -147 +147 @@
 ifdef VBOX_WITH_WDDM
  VirtualBox_DEFS        += VBOX_WITH_WDDM
+endif
+ifdef VBOX_WITH_CRHGSMI
+ VirtualBox_DEFS        += VBOX_WITH_CRHGSMI
 endif
 ifdef VBOX_BLEEDING_EDGE

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

@@ -573 +573 @@
     }
 
-#ifdef VBOX_WITH_VIDEOHWACCEL
+#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)
     /* 2D Video Acceleration is available for Windows guests only: */
     if (pPage == m_pSelector->idToPage(VMSettingsPage_Display))
@@ -582 +582 @@
         VBoxVMSettingsDisplay *pDisplayPage =
             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)
+            {
+                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;
+            }
+        }
+#endif
+#ifdef VBOX_WITH_VIDEOHWACCEL
         if (pGeneralPage && pDisplayPage &&
             pDisplayPage->isAcceleration2DVideoSelected() && !pGeneralPage->isWindowsOSTypeSelected())
@@ -590 +607 @@
             return true;
         }
+#endif
     }
 #endif /* VBOX_WITH_VIDEOHWACCEL */

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

@@ -125 +125 @@
 #endif
 
+#ifdef VBOX_WITH_CRHGSMI
+bool VBoxVMSettingsDisplay::isAcceleration3DSelected() const
+{
+    return mCb3D->isChecked();
+}
+
+int VBoxVMSettingsDisplay::getMinVramSizeMBForWddm3D() const
+{
+    return 128;
+}
+
+int VBoxVMSettingsDisplay::getVramSizeMB() const
+{
+    return mSlMemory->value();
+}
+#endif
+
 void VBoxVMSettingsDisplay::getFrom (const CMachine &aMachine)
 {
@@ -206 +223 @@
 #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

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

@@ -35 +35 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     bool isAcceleration2DVideoSelected() const;
+#endif
+
+#ifdef VBOX_WITH_CRHGSMI
+    bool isAcceleration3DSelected() const;
+    int getMinVramSizeMBForWddm3D() const;
+    int getVramSizeMB() const;
 #endif
 

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

@@ -57 +57 @@
 {
     return mOSTypeSelector->type().GetFamilyId() == "Windows";
+}
+#endif
+
+#ifdef VBOX_WITH_CRHGSMI
+bool VBoxVMSettingsGeneral::isWddmSupportedForOSType() const
+{
+    return mOSTypeSelector->type().GetId() == "Windows Vista"
+            || mOSTypeSelector->type().GetId() == "Windows 7";
 }
 #endif

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

@@ -39 +39 @@
 #endif
 
+#ifdef VBOX_WITH_CRHGSMI
+    bool isWddmSupportedForOSType() const;
+#endif
+
 protected: