Changeset 70851 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Feb 2, 2018 9:54:30 AM (7 years ago)

Author:

vboxsync

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

120671

Message:

HostServices/SharedOpenGL: turn CR_RENDER_FORCE_PRESENT_MAIN_THREAD conditional compilation into a runtime check based on an env variable, for both glx (where it defaults to 1) and wgl (where it defaults to 0).

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.h (modified) (1 diff)
• renderspu_cocoa_helper.m (modified) (2 diffs)
• renderspu_config.c (modified) (1 diff)
• renderspu_glx.c (modified) (2 diffs)
• renderspu_wgl.c (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -247 +247 @@
     int sync;
 #endif
+    int force_present_main_thread;
     int render_to_app_window;
     int render_to_crut_window;

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -116 +116 @@
  * Disable this to see how the output is without the FBO in the middle of the processing chain. */
 #define FBO 1
-/** @def CR_RENDER_FORCE_PRESENT_MAIN_THREAD
- * Force present schedule to main thread. */
 /** @def SHOW_WINDOW_BACKGROUND
  * Define this to see the window background even if the window is clipped. */
@@ -123 +121 @@
  * Define this to get some debug info about the messages flow. */
 #if 0 || defined(DOXYGEN_RUNNING)
-# define CR_RENDER_FORCE_PRESENT_MAIN_THREAD
 # define SHOW_WINDOW_BACKGROUND 1
 # define DEBUG_VERBOSE

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_config.c

@@ -373 +373 @@
     render_spu->sync = 0;
 #endif
-}
-
+
+    /* Config of "render force present main thread" (currently implemented by glx and wgl). */
+    const char *forcePresent = crGetenv("CR_RENDER_FORCE_PRESENT_MAIN_THREAD");
+    if (forcePresent)
+        render_spu->force_present_main_thread = crStrToInt(forcePresent) ? 1 : 0;
+    else
+    {
+#if defined(GLX)
+        /* Customer needed this for avoiding system 3D driver bugs. */
+        render_spu->force_present_main_thread = 1;
+#else
+        render_spu->force_present_main_thread = 0;
+#endif
+    }
+}
+

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_glx.c

@@ -1925 +1925 @@
 }
 
-#define CR_RENDER_FORCE_PRESENT_MAIN_THREAD
-
 void renderspu_SystemVBoxPresentComposition( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry )
 {
-    /* the CR_RENDER_FORCE_PRESENT_MAIN_THREAD is actually inherited from cocoa backend impl,
-     * here it forces rendering in WinCmd thread rather than a Main thread.
-     * it is used for debugging only in any way actually.
-     * @todo: change to some more generic macro name */
-#ifndef CR_RENDER_FORCE_PRESENT_MAIN_THREAD
-    const struct VBOXVR_SCR_COMPOSITOR *pCompositor;
-    /* we do not want to be blocked with the GUI thread here, so only draw her eif we are really able to do that w/o bllocking */
-    int rc = renderspuVBoxCompositorTryAcquire(window, &pCompositor);
-    if (RT_SUCCESS(rc))
-    {
-        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
-        renderspuVBoxCompositorRelease(window);
-    }
-    else if (rc == VERR_SEM_BUSY)
-#endif
+    /* The !render_spu.force_present_main_thread code flow is actually inspired
+     * by cocoa backend impl, here it forces rendering in WinCmd thread rather
+     * than a Main thread.  It defaults to 1, because otherwise there were
+     * 3D driver incompatibilities on some systems. Elsewhere it causes flicker
+     * on NVidia GPUs. In principle would need root cause investigation. */
+    if (!render_spu.force_present_main_thread)
+    {
+        const struct VBOXVR_SCR_COMPOSITOR *pCompositor;
+        /* we do not want to be blocked with the GUI thread here, so only draw here if we are really able to do that w/o blocking */
+        int rc = renderspuVBoxCompositorTryAcquire(window, &pCompositor);
+        if (RT_SUCCESS(rc))
+        {
+            renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
+            renderspuVBoxCompositorRelease(window);
+        }
+        else if (rc != VERR_SEM_BUSY)
+        {
+            /* this is somewhat we do not expect */
+            WARN(("renderspuVBoxCompositorTryAcquire failed rc %d", rc));
+            return;
+        }
+    }
+
     {
         Status status;
@@ -1962 +1968 @@
         XFlush(render_spu.pCommunicationDisplay);
     }
-#ifndef CR_RENDER_FORCE_PRESENT_MAIN_THREAD
-    else
-    {
-        /* this is somewhat we do not expect */
-        WARN(("renderspuVBoxCompositorTryAcquire failed rc %d", rc));
-    }
-#endif
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c

@@ -1287 +1287 @@
 void renderspu_SystemVBoxPresentComposition( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry )
 {
-    /* the CR_RENDER_FORCE_PRESENT_MAIN_THREAD is actually inherited from cocoa backend impl,
-     * here it forces rendering in WinCmd thread rather than a Main thread.
-     * it is used for debugging only in any way actually.
-     * @todo: change to some more generic macro name */
-#ifndef CR_RENDER_FORCE_PRESENT_MAIN_THREAD
-    const struct VBOXVR_SCR_COMPOSITOR *pCompositor;
-    /* we do not want to be blocked with the GUI thread here, so only draw her eif we are really able to do that w/o bllocking */
-    int rc = renderspuVBoxCompositorTryAcquire(window, &pCompositor);
-    if (RT_SUCCESS(rc))
-    {
-        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
-        renderspuVBoxCompositorRelease(window);
-    }
-    else if (rc == VERR_SEM_BUSY)
-#endif
+    /* The !render_spu.force_present_main_thread code flow is actually inspired
+     * by cocoa backend impl, here it forces rendering in WndProc, i.e. main
+     * thread. It defaults to 0, because it is for debugging and working around
+     * bugs. In principle would need root cause investigation. */
+    if (!render_spu.force_present_main_thread)
+    {
+        const struct VBOXVR_SCR_COMPOSITOR *pCompositor;
+        /* we do not want to be blocked with the GUI thread here, so only draw here if we are really able to do that w/o blocking */
+        int rc = renderspuVBoxCompositorTryAcquire(window, &pCompositor);
+        if (RT_SUCCESS(rc))
+        {
+            renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
+            renderspuVBoxCompositorRelease(window);
+        }
+        else if (rc != VERR_SEM_BUSY)
+        {
+            /* this is somewhat we do not expect */
+            crWarning("renderspuVBoxCompositorTryAcquire failed rc %d", rc);
+        }
+    }
+
     {
         render_spu.self.Flush();
@@ -1307 +1313 @@
         RedrawWindow(window->hWnd, NULL, NULL, RDW_INTERNALPAINT);
     }
-#ifndef CR_RENDER_FORCE_PRESENT_MAIN_THREAD
-    else
-    {
-        /* this is somewhat we do not expect */
-        crWarning("renderspuVBoxCompositorTryAcquire failed rc %d", rc);
-    }
-#endif
 }