Changeset 48291 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

Timestamp:

Sep 5, 2013 7:25:47 AM (12 years ago)

Author:

vboxsync

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

88706

Message:

crOpenGL: fix OSX win8.1 rendering

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c (modified) (5 diffs)

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

@@ -142 +142 @@
     WindowInfo *windowInfo;
     const char * pcpwSetting;
+    int rc;
 
     (void) child;
@@ -194 +195 @@
     render_spu.contextTable = crAllocHashtableEx(1, INT32_MAX);
     render_spu.windowTable = crAllocHashtableEx(1, INT32_MAX);
+
+    render_spu.dummyWindowTable = crAllocHashtable();
 
     pcpwSetting = crGetenv("CR_RENDER_ENABLE_SINGLE_PRESENT_CONTEXT");
@@ -217 +220 @@
     CRASSERT(render_spu.default_visual & CR_RGB_BIT);
     
-#ifdef GLX
-    {
-        int rc = renderspu_SystemInit();
-        if (!RT_SUCCESS(rc))
-        {
-            crError("renderspu_SystemInit failed rc %d", rc);
-            return NULL;
-        }
-    }
-#endif
-
+    rc = renderspu_SystemInit();
+    if (!RT_SUCCESS(rc))
+    {
+        crError("renderspu_SystemInit failed rc %d", rc);
+        return NULL;
+    }
 #ifdef USE_OSMESA
     if (render_spu.use_osmesa) {
@@ -444 +442 @@
     {
         crHashtableWalk(render_spu.windowTable, renderspuBlitterCleanupCB, NULL);
-    }
-
-    if (render_spu.defaultSharedContext)
-    {
-        renderspuContextRelease(render_spu.defaultSharedContext);
-        render_spu.defaultSharedContext = NULL;
-    }
+
+        crHashtableWalk(render_spu.dummyWindowTable, renderspuBlitterCleanupCB, NULL);
+    }
+
+    renderspuSetDefaultSharedContext(NULL);
 
     crFreeHashtable(render_spu.contextTable, DeleteContextCallback);
@@ -456 +452 @@
     crFreeHashtable(render_spu.windowTable, DeleteWindowCallback);
     render_spu.windowTable = NULL;
+    crFreeHashtable(render_spu.dummyWindowTable, DeleteWindowCallback);
+    render_spu.dummyWindowTable = NULL;
     crFreeHashtable(render_spu.barrierHash, crFree);
     render_spu.barrierHash = NULL;