Changeset 46434 in vbox

Timestamp:

Jun 7, 2013 11:29:31 AM (11 years ago)

Author:

vboxsync

Message:

Main/Host: Put off calling VBoxOglIs3DAccelerationSupported till the information is actually requied. Saves spawning an extra child process every time Host() is instantiated.

File:

• trunk/src/VBox/Main/src-server/HostImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -210 +210 @@
     /** @}  */
 
-    /* 3D hardware acceleration supported? */
-    BOOL                    f3DAccelerationSupported;
+    /** 3D hardware acceleration supported? Tristate, -1 meaning not probed. */
+    int                     f3DAccelerationSupported;
 
     HostPowerService        *pHostPowerService;
@@ -379 +379 @@
     }
 
-    /* Test for 3D hardware acceleration support */
+#ifdef VBOX_WITH_CROGL
+    /* Test for 3D hardware acceleration support later when (if ever) need. */
+    m->f3DAccelerationSupported = -1;
+#else
     m->f3DAccelerationSupported = false;
-
-#ifdef VBOX_WITH_CROGL
-    m->f3DAccelerationSupported = VBoxOglIs3DAccelerationSupported();
-#endif /* VBOX_WITH_CROGL */
+#endif
 
 #if defined (RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
@@ -1145 +1145 @@
     CheckComArgOutPointerValid(aSupported);
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aSupported = m->f3DAccelerationSupported;
+    HRESULT hrc = autoCaller.rc();
+    if (SUCCEEDED(hrc))
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        if (m->f3DAccelerationSupported != -1)
+            *aSupported = m->f3DAccelerationSupported;
+        else
+        {
+            alock.release();
+#ifdef VBOX_WITH_CROGL
+            bool fSupported = VBoxOglIs3DAccelerationSupported();
+#else
+            bool fSupported = false; /* shoudn't get here, but just in case. */
+#endif
+            AutoWriteLock alock2(this COMMA_LOCKVAL_SRC_POS);
+            m->f3DAccelerationSupported = fSupported;
+            alock2.release();
+
+            *aSupported = fSupported;
+        }
+    }
 
 #ifdef DEBUG_misha
@@ -1155 +1171 @@
 #endif
 
-    return S_OK;
+    return hrc;
 }