Changeset 53595 in vbox for trunk/src/VBox

Timestamp:

Dec 21, 2014 11:34:19 PM (10 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d-ogl.cpp: Moved a LogFlow statement up before the RTMemFree call on the data it logs. Some nits.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -89 +89 @@
 
 #ifdef RT_OS_WINDOWS
-#define OGLGETPROCADDRESS       wglGetProcAddress
+# define OGLGETPROCADDRESS       wglGetProcAddress
 #elif defined(RT_OS_DARWIN)
-#include <dlfcn.h>
+# include <dlfcn.h>
 void *MyNSGLGetProcAddress(const char *name)
 {
@@ -99 +99 @@
     return (s_image ? dlsym(s_image, name) : NULL);
 }
-# define OGLGETPROCADDRESS       MyNSGLGetProcAddress
+# define OGLGETPROCADDRESS      MyNSGLGetProcAddress
 #else
-#define OGLGETPROCADDRESS(x)    glXGetProcAddress((const GLubyte *)x)
+# define OGLGETPROCADDRESS(x)   glXGetProcAddress((const GLubyte *)x)
 #endif
 
@@ -2343 +2343 @@
                     VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
                 }
+
+                LogFlow(("first line:\n%.*Rhxd\n", pBoxes[i].w * pSurface->cbBlock, pDoubleBuffer));
+
                 /* Free the double buffer. */
                 RTMemFree(pDoubleBuffer);
-
-                LogFlow(("first line:\n%.*Rhxd\n", pBoxes[i].w * pSurface->cbBlock, pDoubleBuffer));
                 break;
             }
@@ -2814 +2815 @@
     AssertMsg(ret, ("SwapBuffers failed with %d\n", GetLastError()));
 #elif defined(RT_OS_DARWIN)
-    vmsvga3dCocoaSwapBuffers(pContext->cocoaContext);
+    vmsvga3dCocoaSwapBuffers(pContext->cocoaView, pContext->cocoaContext);
 #else
     /* show the window if not already done */
@@ -3013 +3014 @@
     }
     vmsvga3dCocoaCreateContext(&pContext->cocoaContext, shareContext);
-    NativeNSViewRef pHostView = (NativeNSViewRef*)pThis->svga.u64HostWindowId;
+    NativeNSViewRef pHostView = (NativeNSViewRef)pThis->svga.u64HostWindowId;
     vmsvga3dCocoaCreateView(&pContext->cocoaView, pHostView);
+
 #else
     Window hostWindow = (Window)pThis->svga.u64HostWindowId;
@@ -3028 +3030 @@
         /* start our X event handling thread */
         rc = RTThreadCreate(&pState->pWindowThread, vmsvga3dXEventThread, pState, 0, RTTHREADTYPE_GUI, RTTHREADFLAGS_WAITABLE, "VMSVGA3DXEVENT");
-           if (RT_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             AssertMsgFailed(("%s: Async IO Thread creation for 3d window handling failed rc=%d\n", __FUNCTION__, rc));