Changeset 84754 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jun 10, 2020 12:09:27 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Graphics: fixed regression after r138536 (crash on startup with 3D disabled)

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -3658 +3658 @@
     int             rc;
 
-#if 0 /** @todo r=aeichner Crashes on the testboxes and locally due to a NULL pointer dereference, glLdrInit() probably not called.
-       * Is this really necessary as glLdrInit() will call XInitThreads() itself. */
-# ifdef RT_OS_LINUX
-    XInitThreads();
+# if defined(VBOX_WITH_VMSVGA3D) && defined(RT_OS_LINUX)
+    if (pThis->svga.f3DEnabled)
+    {
+        /* The FIFO thread may use X API for accelerated screen output. */
+        XInitThreads();
+    }
 # endif
-#endif
 
     if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)