Changeset 44913 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Mar 4, 2013 5:24:56 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: fix renderspu cleanup

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (2 diffs)
• renderspu.h (modified) (1 diff)
• renderspu_init.c (modified) (6 diffs)

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

@@ -507 +507 @@
     /* ensure no concurrent draws can take place */
     renderspuVBoxCompositorSet(window, NULL);
+    renderspuVBoxPresentBlitterCleanup(window);
     renderspu_SystemDestroyWindow( window );
     RTCritSectDelete(&window->CompositorLock);
@@ -693 +694 @@
         }
     }
+}
+
+void renderspuVBoxPresentBlitterCleanup( WindowInfo *window )
+{
+    if (!window->pBlitter)
+        return;
+
+    if (render_spu.blitterTable)
+    {
+        CR_BLITTER_WINDOW * pBltInfo = CrBltMuralGetCurrent(window->pBlitter);
+        if (pBltInfo == &window->BltInfo)
+        {
+            CrBltMuralSetCurrent(window->pBlitter, NULL);
+        }
+    }
+    else
+    {
+        CRASSERT(CrBltMuralGetCurrent(window->pBlitter) == &window->BltInfo);
+        CrBltMuralSetCurrent(window->pBlitter, NULL);
+        CrBltTerm(window->pBlitter);
+    }
+    window->pBlitter = NULL;
 }
 

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

@@ -400 +400 @@
 extern void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR * pCompositor, struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry );
 extern PCR_BLITTER renderspuVBoxPresentBlitterGet( WindowInfo *window );
+void renderspuVBoxPresentBlitterCleanup( WindowInfo *window );
 extern int renderspuVBoxPresentBlitterEnter( PCR_BLITTER pBlitter );
 extern PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window );

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

@@ -195 +195 @@
     render_spu.windowTable = crAllocHashtableEx(1, INT32_MAX);
 
-    pcpwSetting = crGetenv("CR_RENDER_ENABLE_PRESENT_CONTEXT_PER_WINDOW");
+    pcpwSetting = crGetenv("CR_RENDER_ENABLE_SINGLE_PRESENT_CONTEXT");
     if (pcpwSetting)
     {
@@ -201 +201 @@
             pcpwSetting = NULL;
     }
-    else
-    {
-        /* default is enable for OSX */
-#if 0 //defined(DARWIN) && defined(VBOX_WITH_COCOA_QT)
-        pcpwSetting = (char*)1;
-#endif
-
-    }
-
 
     if (pcpwSetting)
     {
+        /* TODO: need proper blitter synchronization, do not use so far!
+         * the problem is that rendering can be done in multiple thread: the main command (hgcm) thread and the redraw thread
+         * we currently use per-window synchronization, while we'll need a per-blitter synchronization if one blitter is used for multiple windows
+         * this is not done currently */
+        crWarning("TODO: need proper blitter synchronization, do not use so far!");
         render_spu.blitterTable = crAllocHashtable();
         CRASSERT(render_spu.blitterTable);
@@ -428 +424 @@
 }
 
+static void renderspuBlitterCleanupCB(unsigned long key, void *data1, void *data2)
+{
+    WindowInfo *window = (WindowInfo *) data1;
+    CRASSERT(window);
+
+    renderspuVBoxPresentBlitterCleanup( window );
+}
+
 static int renderSPUCleanup(void)
 {
     renderspuVBoxCompositorClearAll();
+
+    if (render_spu.blitterTable)
+    {
+        crFreeHashtable(render_spu.blitterTable, DeleteBlitterCallback);
+        render_spu.blitterTable = NULL;
+    }
+    else
+    {
+        crHashtableWalk(render_spu.windowTable, renderspuBlitterCleanupCB, NULL);
+    }
+
     crFreeHashtable(render_spu.contextTable, DeleteContextCallback);
     render_spu.contextTable = NULL;
@@ -437 +452 @@
     crFreeHashtable(render_spu.barrierHash, crFree);
     render_spu.barrierHash = NULL;
-
-    if (render_spu.blitterTable)
-        crFreeHashtable(render_spu.blitterTable, DeleteBlitterCallback);
 
 #ifdef RT_OS_DARWIN
@@ -527 +539 @@
 }
 
+#ifdef RT_OS_DARWIN
 static void renderspuWindowVisibleRegionCB(unsigned long key, void *data1, void *data2)
 {
@@ -534 +547 @@
     renderspu_SystemWindowApplyVisibleRegion(window);
 }
+#endif
 
 DECLEXPORT(void) renderspuSetRootVisibleRegion(GLint cRects, GLint *pRects)