Changeset 54639 in vbox for trunk/src

Timestamp:

Mar 5, 2015 12:34:02 AM (10 years ago)

Author:

vboxsync

Message:

logging

File:

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

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

@@ -163 +163 @@
 #elif defined(RT_OS_DARWIN)
 # define VMSVGA3D_SET_CURRENT_CONTEXT(pState, pContext) \
-    if ((pState)->idActiveContext != (pContext)->id)                    \
-    {                                                                   \
+    if ((pState)->idActiveContext != (pContext)->id) \
+    { \
         vmsvga3dCocoaViewMakeCurrentContext((pContext)->cocoaView, (pContext)->cocoaContext); \
         LogFlowFunc(("Changing context: %#x -> %#x\n", (pState)->idActiveContext, (pContext)->id)); \
-        (pState)->idActiveContext = (pContext)->id;                     \
+        (pState)->idActiveContext = (pContext)->id; \
     } else do { } while (0)
 #else
@@ -182 +182 @@
 #endif
 
-/** @def VMSVGA3D_CLEAR_LAST_ERRORS
+/** @def VMSVGA3D_CLEAR_GL_ERRORS
  * Clears all pending OpenGL errors.
  *
@@ -251 +251 @@
     do { \
         AssertMsg((a_pState)->idActiveContext == (a_pContext)->id, \
-                  ("idActiveContext=%#x id=%#x\n", (a_pState)->idActiveContext, (a_pContext)->id)); \
+                  ("idActiveContext=%#x id=%x\n", (a_pState)->idActiveContext, (a_pContext)->id)); \
         RTAssertMsg2Weak a_LogRelDetails; \
         GLenum iNextError; \
@@ -2775 +2775 @@
     VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
 
-    LogFlow(("vmsvga3dCreateTexture: sid=%#x idAssociatedContext %#x -> %#x; oglId.texture=%#x\n",
+    LogFlow(("vmsvga3dCreateTexture: sid=%x idAssociatedContext %#x -> %#x; oglId.texture=%#x\n",
              pSurface->id, pSurface->idAssociatedContext, idAssociatedContext, pSurface->oglId.texture));
     pSurface->flags              |= SVGA3D_SURFACE_HINT_TEXTURE;
@@ -2805 +2805 @@
     AssertReturn(pSurfaceDest->faces[0].numMipLevels > dest.mipmap, VERR_INVALID_PARAMETER);
 
-    Log(("vmsvga3dSurfaceStretchBlt: src sid=%x cid=%#x (%d,%d)(%d,%d) dest sid=%x cid=%#x (%d,%d)(%d,%d) mode=%x\n",
+    Log(("vmsvga3dSurfaceStretchBlt: src sid=%x cid=%x (%d,%d)(%d,%d) dest sid=%x cid=%x (%d,%d)(%d,%d) mode=%x\n",
          src.sid, pSurfaceSrc->idAssociatedContext, srcBox.x, srcBox.y, srcBox.x + srcBox.w, srcBox.y + srcBox.h,
          dest.sid, pSurfaceDest->idAssociatedContext, destBox.x, destBox.y, destBox.x + destBox.w, destBox.y + destBox.h, mode));
@@ -5278 +5278 @@
             VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
 
-            LogFlow(("vmsvga3dSetRenderTarget: sid=%#x idAssociatedContext %#x -> %#x\n", pRenderTarget->id, pRenderTarget->idAssociatedContext, cid));
+            LogFlow(("vmsvga3dSetRenderTarget: sid=%x idAssociatedContext %#x -> %#x\n", pRenderTarget->id, pRenderTarget->idAssociatedContext, cid));
             pRenderTarget->idAssociatedContext = cid;
         }
@@ -6365 +6365 @@
     }
     pVertexSurface->idAssociatedContext = pContext->id;
-    LogFlow(("vmsvga3dDrawPrimitivesProcessVertexDecls: sid=%#x idAssociatedContext %#x -> %#x\n", pVertexSurface->id, pVertexSurface->idAssociatedContext, pContext->id));
+    LogFlow(("vmsvga3dDrawPrimitivesProcessVertexDecls: sid=%x idAssociatedContext %#x -> %#x\n", pVertexSurface->id, pVertexSurface->idAssociatedContext, pContext->id));
 
     /* Setup the vertex declarations. */
@@ -6667 +6667 @@
                 VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
             }
-            LogFlow(("vmsvga3dDrawPrimitives: sid=%#x idAssociatedContext %#x -> %#x\n", pIndexSurface->id, pIndexSurface->idAssociatedContext, pContext->id));
+            LogFlow(("vmsvga3dDrawPrimitives: sid=%x idAssociatedContext %#x -> %#x\n", pIndexSurface->id, pIndexSurface->idAssociatedContext, pContext->id));
             pIndexSurface->idAssociatedContext = pContext->id;
         }