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

Timestamp:

Apr 16, 2014 11:32:58 AM (11 years ago)

Author:

vboxsync

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

93351

Message:

crOpenGL/OSX: bugfixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (1 diff)
• renderspu_cocoa.c (modified) (4 diffs)

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

@@ -1773 +1773 @@
 {
     WindowInfo *pWindow = (WindowInfo *)data1;
-    CRHashTable *pTable = (CRHashTable*)data2;
-
-    crHashtableDelete(pTable, key, NULL);
-
-    renderspuWindowTerm(pWindow);
-
-    crFree(pWindow);
+
+    renderspu_SystemReparentWindow(pWindow);
 }
 

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

@@ -229 +229 @@
     GET_CONTEXT(pCurCtx);
     pInfo->pContext = pCurCtx;
-    pInfo->pWindow = pCurCtx->currentWindow;
+    pInfo->pWindow = pCurCtx ? pCurCtx->currentWindow : NULL;
 }
 
@@ -254 +254 @@
         if (!window)
         {
-            crWarning("renderspuGetDummyWindow failed");
+            WARN(("renderspuGetDummyWindow failed"));
             return GL_FALSE;
         }
@@ -285 +285 @@
             }
             else
-                crWarning("renderspuCtxSetCurrentWithAnyWindow failed!");
+                WARN(("renderspuCtxSetCurrentWithAnyWindow failed!"));
         }
     }
@@ -302 +302 @@
             int rc = CrGlslProgGenAllNoAlpha(&render_spu.GlobalShaders);
             if (!RT_SUCCESS(rc))
-                crWarning("CrGlslProgGenAllNoAlpha failed, rc %d", rc);
+                WARN(("CrGlslProgGenAllNoAlpha failed, rc %d", rc));
 
             renderspuCtxInfoRestoreCurrent(&Info);