Changeset 46433 in vbox

Timestamp:

Jun 7, 2013 11:28:10 AM (12 years ago)

Author:

vboxsync

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

86275

Message:

VirtualBox/VBoxGlobal: Put off calling VBoxOglIs3DAccelerationSupported (and thereby spawning a child process) till when the information is actually requested for the first time. Saved time and extra log file when starting VMs without 3D enabled.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• VBoxGlobal.cpp (modified) (4 diffs)
• VBoxGlobal.h (modified) (1 diff)

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

@@ -271 +271 @@
     , mWarpPct(100)
     , mVerString("1.0")
-    , m3DAvailable(false)
+    , m3DAvailable(-1)
     , mSettingsPwSet(false)
 {
@@ -408 +408 @@
     return m_pVirtualMachine->activeWindow();
 }
+
+
+/**
+ * Inner worker that for lazily querying for 3D support.
+ *
+ * Rational is that when starting a text mode guest (like DOS) that does not
+ * have 3D enabled, don't wast the developer's or user's time on launching the
+ * test application when starting the VM or editing it's settings.
+ *
+ * @returns true / false.
+ * @note If we ever end up checking this concurrently on multiple threads, use a
+ *       RTONCE construct to serialize the efforts.
+ */
+bool VBoxGlobal::is3DAvailableWorker() const
+{
+    bool fSupported = VBoxOglIs3DAccelerationSupported();
+    unconst(this)->m3DAvailable = fSupported;
+    return fSupported;
+}
+
 
 #ifdef VBOX_GUI_WITH_PIDFILE
@@ -1210 +1230 @@
         }
 
-        QString acc3d = is3DAvailable() && aMachine.GetAccelerate3DEnabled()
+        QString acc3d = aMachine.GetAccelerate3DEnabled() && is3DAvailable()
             ? tr ("Enabled", "details report (3D Acceleration)")
             : tr ("Disabled", "details report (3D Acceleration)");
@@ -4027 +4047 @@
     }
     mHost = virtualBox().GetHost();
-#ifdef VBOX_WITH_CROGL
-    m3DAvailable = VBoxOglIs3DAccelerationSupported();
-#else
-    m3DAvailable = false;
-#endif
 
     /* create default non-null global settings */

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

@@ -96 +96 @@
     QWidget* activeMachineWindow();
 
-    bool is3DAvailable() const { return m3DAvailable; }
+    bool is3DAvailableWorker() const;
+    bool is3DAvailable() const { if (m3DAvailable < 0) return is3DAvailableWorker(); return m3DAvailable != 0; }
 
 #ifdef VBOX_GUI_WITH_PIDFILE