Changeset 54626 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2015 2:40:39 PM (10 years ago)

Author:

vboxsync

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

98769

Message:

DevVGA-SVGA3d-ogl.cpp: LogFlow idAssociatedContext changes.

File:

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

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

@@ -2770 +2770 @@
 
     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;
@@ -2796 +2797 @@
     AssertReturn(pSurfaceDest->faces[0].numMipLevels > dest.mipmap, VERR_INVALID_PARAMETER);
 
-    Log(("vmsvga3dSurfaceStretchBlt: src sid=%x (%d,%d)(%d,%d) dest sid=%x (%d,%d)(%d,%d) mode=%x\n", src.sid, srcBox.x, srcBox.y, srcBox.x + srcBox.w, srcBox.y + srcBox.h, dest.sid, destBox.x, destBox.y, destBox.x + destBox.w, destBox.y + destBox.h, mode));
+    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));
 
     /* @todo stricter checks for associated context */
@@ -5265 +5268 @@
             VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
 
+            LogFlow(("vmsvga3dSetRenderTarget: sid=%#x idAssociatedContext %#x -> %#x\n", pRenderTarget->id, pRenderTarget->idAssociatedContext, cid));
             pRenderTarget->idAssociatedContext = cid;
         }
@@ -5278 +5282 @@
         pRenderTarget->flags |= SVGA3D_SURFACE_HINT_DEPTHSTENCIL;
 
-        pState->ext.glFramebufferRenderbuffer(GL_FRAMEBUFFER, (type == SVGA3D_RT_DEPTH) ? GL_DEPTH_ATTACHMENT : GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, pRenderTarget->oglId.renderbuffer);
+        pState->ext.glFramebufferRenderbuffer(GL_FRAMEBUFFER,
+                                              (type == SVGA3D_RT_DEPTH) ? GL_DEPTH_ATTACHMENT : GL_STENCIL_ATTACHMENT,
+                                              GL_RENDERBUFFER, pRenderTarget->oglId.renderbuffer);
         VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
         break;
@@ -6103 +6109 @@
 }
 
-int vmsvga3dCommandClear(PVGASTATE pThis, uint32_t cid, SVGA3dClearFlag clearFlag, uint32_t color, float depth, uint32_t stencil, uint32_t cRects, SVGA3dRect *pRect)
+int vmsvga3dCommandClear(PVGASTATE pThis, uint32_t cid, SVGA3dClearFlag clearFlag, uint32_t color, float depth, uint32_t stencil,
+                         uint32_t cRects, SVGA3dRect *pRect)
 {
     GLbitfield            mask = 0;
@@ -6348 +6355 @@
     }
     pVertexSurface->idAssociatedContext = pContext->id;
+    LogFlow(("vmsvga3dDrawPrimitivesProcessVertexDecls: sid=%#x idAssociatedContext %#x -> %#x\n", pVertexSurface->id, pVertexSurface->idAssociatedContext, pContext->id));
 
     /* Setup the vertex declarations. */
@@ -6649 +6657 @@
                 VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
             }
+            LogFlow(("vmsvga3dDrawPrimitives: sid=%#x idAssociatedContext %#x -> %#x\n", pIndexSurface->id, pIndexSurface->idAssociatedContext, pContext->id));
             pIndexSurface->idAssociatedContext = pContext->id;
         }