Changeset 54633 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Mar 4, 2015 6:24:16 PM (10 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d-ogl.cpp: More logging.

File:

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

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

@@ -152 +152 @@
  */
 #ifdef RT_OS_WINDOWS
-# define VMSVGA3D_SET_CURRENT_CONTEXT(pState, pContext)                   \
-    if ((pState)->idActiveContext != pContext->id)                        \
-    {                                                                     \
+# define VMSVGA3D_SET_CURRENT_CONTEXT(pState, pContext) \
+    if ((pState)->idActiveContext != pContext->id) \
+    { \
         BOOL fMakeCurrentRc = wglMakeCurrent((pContext)->hdc, (pContext)->hglrc); \
-        Assert(fMakeCurrentRc == TRUE);                                   \
-        pState->idActiveContext = (pContext)->id;                         \
+        Assert(fMakeCurrentRc == TRUE); \
+        LogFlowFunc(("Changing context: %#x -> %#x\n", (pState)->idActiveContext, (pContext)->id)); \
+        (pState)->idActiveContext = (pContext)->id; \
     } else do { } while (0)
 
@@ -165 +166 @@
     {                                                                   \
         vmsvga3dCocoaViewMakeCurrentContext((pContext)->cocoaView, (pContext)->cocoaContext); \
+        LogFlowFunc(("Changing context: %#x -> %#x\n", (pState)->idActiveContext, (pContext)->id)); \
         (pState)->idActiveContext = (pContext)->id;                     \
     } else do { } while (0)
 #else
 # define VMSVGA3D_SET_CURRENT_CONTEXT(pState, pContext) \
-    if ((pState)->idActiveContext != (pContext)->id)                    \
-    {                                                                   \
-        Bool fMakeCurrentRc = glXMakeCurrent((pState)->display,         \
-                                             (pContext)->window,        \
-                                             (pContext)->glxContext);   \
-        Assert(fMakeCurrentRc == True);                                 \
-        (pState)->idActiveContext = (pContext)->id;                     \
+    if ((pState)->idActiveContext != (pContext)->id) \
+    { \
+        Bool fMakeCurrentRc = glXMakeCurrent((pState)->display, \
+                                             (pContext)->window, \
+                                             (pContext)->glxContext); \
+        Assert(fMakeCurrentRc == True); \
+        LogFlowFunc(("Changing context: %#x -> %#x\n", (pState)->idActiveContext, (pContext)->id)); \
+        (pState)->idActiveContext = (pContext)->id; \
     } else do { } while (0)
 #endif
@@ -2754 +2757 @@
     }
     else
+    {
         /* Reserve texture memory. */
         glTexImage2D(GL_TEXTURE_2D,
@@ -2764 +2768 @@
                      pSurface->typeGL,
                      NULL);
+        VMSVGA3D_CHECK_LAST_ERROR_WARN(pState, pContext);
+    }
 
     /* Restore the old active texture. */
@@ -2769 +2775 @@
     VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
 
+    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;
-    LogFlow(("vmsvga3dCreateTexture: sid=%#x idAssociatedContext %#x -> %#x\n", pSurface->id, pSurface->idAssociatedContext, idAssociatedContext));
     pSurface->idAssociatedContext = idAssociatedContext;
     return VINF_SUCCESS;
 }
 
-int vmsvga3dSurfaceStretchBlt(PVGASTATE pThis, SVGA3dSurfaceImageId dest, SVGA3dBox destBox, SVGA3dSurfaceImageId src, SVGA3dBox srcBox, SVGA3dStretchBltMode mode)
+int vmsvga3dSurfaceStretchBlt(PVGASTATE pThis, SVGA3dSurfaceImageId dest, SVGA3dBox destBox,
+                              SVGA3dSurfaceImageId src, SVGA3dBox srcBox, SVGA3dStretchBltMode mode)
 {
     PVMSVGA3DSTATE      pState = (PVMSVGA3DSTATE)pThis->svga.p3dState;
@@ -2838 +2846 @@
 
     /* Bind the source and destination objects to the right place. */
-    pState->ext.glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, pSurfaceSrc->oglId.texture, src.mipmap);
+    pState->ext.glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+                                       pSurfaceSrc->oglId.texture, src.mipmap);
     VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
-    pState->ext.glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, pSurfaceDest->oglId.texture, dest.mipmap);
+    pState->ext.glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
+                                       pSurfaceDest->oglId.texture, dest.mipmap);
     VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);