Changeset 40192 in vbox

Timestamp:

Feb 21, 2012 10:46:37 AM (13 years ago)

Author:

vboxsync

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

76356

Message:

3D check: don't prevent the user from enabling 3D acceleration in the VM settings but fail to start the VM if 3D is not available on the host

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/selector/UIVMDesktop.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -842 +842 @@
                 accel << tr("2D Video", "details report");
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-            if (   vboxGlobal().is3DAvailable()
-                && m_machine.GetAccelerate3DEnabled())
+            if (m_machine.GetAccelerate3DEnabled())
                 accel << tr("3D", "details report");
 

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

@@ -325 +325 @@
     checkVRAMRequirements();
 
+    if (mCb3D->isChecked() && !vboxGlobal().is3DAvailable())
+    {
+        strWarning = tr("you enabled 3D acceleration. However, 3D acceleration is not "
+                        "working on the current host setup so you will not be able to "
+                        "start the VM.");
+        return true;
+    }
+
     /* Video RAM amount test: */
     if (shouldWeWarnAboutLowVideoMemory() && !m_guestOSType.isNull())
@@ -523 +531 @@
     mLeMonitors->setEnabled(isMachineOffline());
     mLbOptions->setEnabled(isMachineOffline());
-    if (vboxGlobal().is3DAvailable())
-        mCb3D->setEnabled(isMachineOffline());
-    else
-    {
-        mCb3D->setEnabled(false);
-        mCb3D->setChecked(false);
-    }
+    mCb3D->setEnabled(isMachineOffline());
 #ifdef VBOX_WITH_VIDEOHWACCEL
     mCb2DVideo->setEnabled(isMachineOffline() && VBoxGlobal::isAcceleration2DVideoAvailable());

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2509 +2509 @@
                 hrc = host->COMGETTER(Acceleration3DAvailable)(&fSupports3D); H();
                 if (!fSupports3D)
-                {
-                    setVMRuntimeErrorCallbackF(pVM, this, 0,
-                            "Accel3DNotAvailable",
-                            N_("This VM was configured to use 3D support. However, the "
-                               "3D support of the host is not working properly. Therefore "
-                               "3D support for the guest has been disabled"));
-                    fEnabled3D = false;
-                }
-            }
-
-            if (fEnabled3D)
-            {
+                    return VMSetError(pVM, VERR_NOT_AVAILABLE, RT_SRC_POS,
+                            N_("This VM was configured to use 3D acceleration. However, the "
+                               "3D support of the host is not working properly and the "
+                               "VM cannot be started. To fix this problem, either "
+                               "fix the host 3D support (update the host graphics driver?) "
+                               "or disable 3D acceleration in the VM settings"));
+
                 /* Load the service */
                 rc = pVMMDev->hgcmLoadService("VBoxSharedCrOpenGL", "VBoxSharedCrOpenGL");