VirtualBox

Changeset 67179 in vbox for trunk


Ignore:
Timestamp:
May 31, 2017 7:14:33 PM (8 years ago)
Author:
vboxsync
Message:

DevVGA-SVGA3d-win.cpp: logging fixes, sid= prefix for all surface ids

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

    r65381 r67179  
    13411341        pContext = pState->papContexts[cid];
    13421342
    1343         Log(("vmsvga3dSurfaceCopy: create texture surface id=%x type=%d format=%d -> create texture\n", sidDest, pSurfaceDest->flags, pSurfaceDest->format));
     1343        Log(("vmsvga3dSurfaceCopy: create texture sid=%x type=%d format=%d -> create texture\n", sidDest, pSurfaceDest->flags, pSurfaceDest->format));
    13441344        rc = vmsvga3dBackCreateTexture(pState, pContext, cid, pSurfaceDest);
    13451345        AssertRCReturn(rc, rc);
    … …  
    13711371            &&  pSurfaceSrc->idAssociatedContext != cid)
    13721372        {
    1373             Log(("vmsvga3dSurfaceCopy; using texture %x created for another context (%d vs %d)\n", sidSrc, pSurfaceSrc->idAssociatedContext, cid));
     1373            Log(("vmsvga3dSurfaceCopy; using texture sid=%x created for another context (%d vs %d)\n", sidSrc, pSurfaceSrc->idAssociatedContext, cid));
    13741374
    13751375            PVMSVGA3DSHAREDSURFACE pSharedSurface = vmsvga3dSurfaceGetSharedCopy(pThis, pContext, pSurfaceSrc);
    … …  
    14561456        Rect.bottom = pBox[i].srcy + pBox[i].h;   /* exclusive */
    14571457
    1458         Log(("vmsvga3dSurfaceCopy: (manual) copy src=%x src=%x face=%d (%d,%d)(%d,%d) to dest=%x src=%x face=%d (%d,%d)\n", sidSrc, src.face, src.mipmap, Rect.left, Rect.top, Rect.right, Rect.bottom, sidDest, dest.face, dest.mipmap, pBox[i].x, pBox[i].y));
     1458        Log(("vmsvga3dSurfaceCopy: (manual) copy sid=%x face=%d mipmap=%d (%d,%d)(%d,%d) to sid=%x face=%d mipmap=%d (%d,%d)\n", sidSrc, src.face, src.mipmap, Rect.left, Rect.top, Rect.right, Rect.bottom, sidDest, dest.face, dest.mipmap, pBox[i].x, pBox[i].y));
    14591459
    14601460        Assert(!pBox[i].srcz && !pBox[i].z);
    … …  
    18821882
    18831883        if (fTexture)
    1884             Log(("Lock TEXTURE (bounce=%d) memory for rectangle (%d,%d)(%d,%d)\n", !!(pSurface->bounce.pTexture), Rect.left, Rect.top, Rect.right, Rect.bottom));
     1884            Log(("Lock sid=%x TEXTURE (bounce=%d) memory for rectangle (%d,%d)(%d,%d)\n", pSurface->id, !!(pSurface->bounce.pTexture), Rect.left, Rect.top, Rect.right, Rect.bottom));
    18851885        else
    1886             Log(("Lock %s memory for rectangle (%d,%d)(%d,%d)\n", (pSurface->flags & SVGA3D_SURFACE_HINT_DEPTHSTENCIL) ? "DEPTH-STENCIL" : "RENDERTARGET", Rect.left, Rect.top, Rect.right, Rect.bottom));
     1886            Log(("Lock sid=%x %s memory for rectangle (%d,%d)(%d,%d)\n", pSurface->id, (pSurface->flags & SVGA3D_SURFACE_HINT_DEPTHSTENCIL) ? "DEPTH-STENCIL" : "RENDERTARGET", Rect.left, Rect.top, Rect.right, Rect.bottom));
    18871887
    18881888        rc = vmsvgaGMRTransfer(pThis,
    … …  
    19921992{
    19931993    /* Requires SVGA_FIFO_CAP_SCREEN_OBJECT support */
    1994     Log(("vmsvga3dSurfaceBlitToScreen: dest=%d (%d,%d)(%d,%d) surface=%x (face=%d, mipmap=%d) (%d,%d)(%d,%d) cRects=%d\n", dest, destRect.left, destRect.top, destRect.right, destRect.bottom, src.sid, src.face, src.mipmap, srcRect.left, srcRect.top, srcRect.right, srcRect.bottom, cRects));
     1994    Log(("vmsvga3dSurfaceBlitToScreen: dest=%d (%d,%d)(%d,%d) sid=%x (face=%d, mipmap=%d) (%d,%d)(%d,%d) cRects=%d\n", dest, destRect.left, destRect.top, destRect.right, destRect.bottom, src.sid, src.face, src.mipmap, srcRect.left, srcRect.top, srcRect.right, srcRect.bottom, cRects));
    19951995    for (uint32_t i = 0; i < cRects; i++)
    19961996    {
    … …  
    21412141
    21422142        /* Unknown surface type; turn it into a texture. */
    2143         Log(("vmsvga3dGenerateMipmaps: unknown src surface id=%x type=%d format=%d -> create texture\n", sid, pSurface->flags, pSurface->format));
     2143        Log(("vmsvga3dGenerateMipmaps: unknown src surface sid=%x type=%d format=%d -> create texture\n", sid, pSurface->flags, pSurface->format));
    21442144        rc = vmsvga3dBackCreateTexture(pState, pContext, cid, pSurface);
    21452145        AssertRCReturn(rc, rc);
    … …  
    25392539                int rc;
    25402540
    2541                 Log(("vmsvga3dContextDestroy: remove all dependencies for surface %x\n", sid));
     2541                Log(("vmsvga3dContextDestroy: remove all dependencies for surface sid=%x\n", sid));
    25422542
    25432543                uint32_t            surfaceFlags = pSurface->flags;
    … …  
    25802580                if (pSharedSurface)
    25812581                {
    2582                     Log(("vmsvga3dContextDestroy: remove shared dependency for surface %x\n", sid));
     2582                    Log(("vmsvga3dContextDestroy: remove shared dependency for surface sid=%x\n", sid));
    25832583
    25842584                    switch (pSurface->flags & (SVGA3D_SURFACE_HINT_INDEXBUFFER | SVGA3D_SURFACE_HINT_VERTEXBUFFER | SVGA3D_SURFACE_HINT_TEXTURE | SVGA3D_SURFACE_HINT_RENDERTARGET | SVGA3D_SURFACE_HINT_DEPTHSTENCIL | SVGA3D_SURFACE_CUBEMAP))
    … …  
    37543754    AssertReturn(target.face == 0, VERR_INVALID_PARAMETER);
    37553755
    3756     Log(("vmsvga3dSetRenderTarget cid=%x type=%x surface id=%x\n", cid, type, target.sid));
     3756    Log(("vmsvga3dSetRenderTarget cid=%x type=%x sid=%x\n", cid, type, target.sid));
    37573757
    37583758    if (    cid >= pState->cContexts
    … …  
    39643964            if (!pRenderTarget->u.pTexture)
    39653965            {
    3966                 Log(("vmsvga3dSetRenderTarget: create texture to be used as render target; surface id=%x type=%d format=%d -> create texture\n", target.sid, pRenderTarget->flags, pRenderTarget->format));
     3966                Log(("vmsvga3dSetRenderTarget: create texture to be used as render target; sid=%x type=%d format=%d -> create texture\n", target.sid, pRenderTarget->flags, pRenderTarget->format));
    39673967                int rc = vmsvga3dBackCreateTexture(pState, pContext, cid, pRenderTarget);
    39683968                AssertRCReturn(rc, rc);
    … …  
    39723972            if (pRenderTarget->idAssociatedContext != cid)
    39733973            {
    3974                 Log(("vmsvga3dSetRenderTarget; using texture %x created for another context (%d vs %d)\n", target.sid, pRenderTarget->idAssociatedContext, cid));
     3974                Log(("vmsvga3dSetRenderTarget; using texture sid=%x created for another context (%d vs %d)\n", target.sid, pRenderTarget->idAssociatedContext, cid));
    39753975
    39763976                PVMSVGA3DSHAREDSURFACE pSharedSurface = vmsvga3dSurfaceGetSharedCopy(pThis, pContext, pRenderTarget);
    … …  
    43004300            if (pTextureState[i].value == SVGA3D_INVALID_ID)
    43014301            {
    4302                 Log(("SVGA3D_TS_BIND_TEXTURE: stage %d, texture surface id=%x\n", currentStage, pTextureState[i].value));
     4302                Log(("SVGA3D_TS_BIND_TEXTURE: stage %d, texture sid=%x\n", currentStage, pTextureState[i].value));
    43034303
    43044304                pContext->aSidActiveTexture[currentStage] = SVGA3D_INVALID_ID;
    … …  
    43174317                PVMSVGA3DSURFACE pSurface = pState->papSurfaces[sid];
    43184318
    4319                 Log(("SVGA3D_TS_BIND_TEXTURE: stage %d, texture surface id=%x (%d,%d)\n", currentStage, pTextureState[i].value, pSurface->pMipmapLevels[0].size.width, pSurface->pMipmapLevels[0].size.height));
     4319                Log(("SVGA3D_TS_BIND_TEXTURE: stage %d, texture sid=%x (%d,%d)\n", currentStage, pTextureState[i].value, pSurface->pMipmapLevels[0].size.width, pSurface->pMipmapLevels[0].size.height));
    43204320
    43214321                if (!pSurface->u.pTexture)
    … …  
    43354335                if (pSurface->idAssociatedContext != cid)
    43364336                {
    4337                     Log(("vmsvga3dSetTextureState; using texture %x created for another context (%d vs %d)\n", sid, pSurface->idAssociatedContext, cid));
     4337                    Log(("vmsvga3dSetTextureState; using texture sid=%x created for another context (%d vs %d)\n", sid, pSurface->idAssociatedContext, cid));
    43384338
    43394339                    PVMSVGA3DSHAREDSURFACE pSharedSurface = vmsvga3dSurfaceGetSharedCopy(pThis, pContext, pSurface);
    … …  
    47934793
    47944794        pVertexSurface = pState->papSurfaces[sidVertex];
    4795         Log(("vmsvga3dDrawPrimitives: vertex surface %x stream %d\n", sidVertex, idStream));
     4795        Log(("vmsvga3dDrawPrimitives: vertex sid=%x stream %d\n", sidVertex, idStream));
    47964796        Log(("vmsvga3dDrawPrimitives: type=%s (%d) method=%s (%d) usage=%s (%d) usageIndex=%d stride=%d offset=%d\n", vmsvgaDeclType2String(pVertexDecl[iVertex].identity.type), pVertexDecl[iVertex].identity.type, vmsvgaDeclMethod2String(pVertexDecl[iVertex].identity.method), pVertexDecl[iVertex].identity.method, vmsvgaDeclUsage2String(pVertexDecl[iVertex].identity.usage), pVertexDecl[iVertex].identity.usage, pVertexDecl[iVertex].identity.usageIndex, pVertexDecl[iVertex].array.stride, pVertexDecl[iVertex].array.offset));
    47974797
    … …  
    50105010            }
    50115011            pIndexSurface = pState->papSurfaces[sidIndex];
    5012             Log(("vmsvga3dDrawPrimitives: index surface %x\n", sidIndex));
     5012            Log(("vmsvga3dDrawPrimitives: index sid=%x\n", sidIndex));
    50135013
    50145014            if (!pIndexSurface->u.pIndexBuffer)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette