Changeset 64483 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 29, 2016 11:28:48 AM (8 years ago)

Author:

vboxsync

Message:

DevVGA_SVGA: fixed index/vertex buffer usage with recent Mesa

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-internal.h (modified) (1 diff)
• DevVGA-SVGA3d-ogl.cpp (modified) (3 diffs)
• DevVGA-SVGA3d-win.cpp (modified) (5 diffs)
• DevVGA-SVGA3d.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -556 +556 @@
     AVLU32TREE              pSharedObjectTree;
     bool                    fStencilAsTexture;
+    uint32_t                fu32ActualUsageFlags;
 #endif
 } VMSVGA3DSURFACE;

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

@@ -1848 +1848 @@
         break;
 
+    case SVGA3D_SURFACE_HINT_INDEXBUFFER | SVGA3D_SURFACE_HINT_VERTEXBUFFER:
     case SVGA3D_SURFACE_HINT_INDEXBUFFER:
     case SVGA3D_SURFACE_HINT_VERTEXBUFFER:
@@ -2456 +2457 @@
         break;
 
+    case SVGA3D_SURFACE_HINT_VERTEXBUFFER | SVGA3D_SURFACE_HINT_INDEXBUFFER:
     case SVGA3D_SURFACE_HINT_VERTEXBUFFER:
     case SVGA3D_SURFACE_HINT_INDEXBUFFER:
@@ -2481 +2483 @@
                               <= pMipLevel->cbSurface))
                 {
-                    Log(("Lock %s memory for rectangle (%d,%d)(%d,%d)\n", (pSurface->flags & VMSVGA3D_SURFACE_HINT_SWITCH_MASK) == SVGA3D_SURFACE_HINT_VERTEXBUFFER ? "vertex" : "index",
+                    Log(("Lock %s memory for rectangle (%d,%d)(%d,%d)\n",
+                         (pSurface->flags & VMSVGA3D_SURFACE_HINT_SWITCH_MASK) == SVGA3D_SURFACE_HINT_VERTEXBUFFER ? "vertex" :
+                           (pSurface->flags & VMSVGA3D_SURFACE_HINT_SWITCH_MASK) == SVGA3D_SURFACE_HINT_INDEXBUFFER ? "index" : "buffer",
                          pBox->x, pBox->y, pBox->x + pBox->w, pBox->y + pBox->h));
 

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

@@ -1103 +1103 @@
         break;
 
+    case SVGA3D_SURFACE_HINT_INDEXBUFFER | SVGA3D_SURFACE_HINT_VERTEXBUFFER:
     case SVGA3D_SURFACE_HINT_INDEXBUFFER:
-        if (pSurface->u.pIndexBuffer)
-            pSurface->u.pIndexBuffer->Release();
-        break;
-
     case SVGA3D_SURFACE_HINT_VERTEXBUFFER:
-        if (pSurface->u.pVertexBuffer)
-            pSurface->u.pVertexBuffer->Release();
+        if (pSurface->fu32ActualUsageFlags == SVGA3D_SURFACE_HINT_VERTEXBUFFER)
+        {
+            if (pSurface->u.pVertexBuffer)
+                pSurface->u.pVertexBuffer->Release();
+        }
+        else if (pSurface->fu32ActualUsageFlags == SVGA3D_SURFACE_HINT_INDEXBUFFER)
+        {
+            if (pSurface->u.pIndexBuffer)
+                pSurface->u.pIndexBuffer->Release();
+        }
+        else
+            AssertMsg(pSurface->u.pVertexBuffer == NULL, ("fu32ActualUsageFlags %x\n", pSurface->fu32ActualUsageFlags));
         break;
 
@@ -1930 +1937 @@
     }
 
+    case SVGA3D_SURFACE_HINT_VERTEXBUFFER | SVGA3D_SURFACE_HINT_INDEXBUFFER:
     case SVGA3D_SURFACE_HINT_VERTEXBUFFER:
-        fVertex = true;
+        fVertex = RT_BOOL(pSurface->fu32ActualUsageFlags & SVGA3D_SURFACE_HINT_VERTEXBUFFER);
         /* no break */
 
@@ -1973 +1981 @@
 
     default:
-        AssertFailed();
+        AssertMsgFailed(("Unsupported surface hint 0x%08X\n", pSurface->flags & VMSVGA3D_SURFACE_HINT_SWITCH_MASK));
         break;
     }
@@ -4833 +4841 @@
             }
             pVertexSurface->flags |= SVGA3D_SURFACE_HINT_VERTEXBUFFER;
+            pVertexSurface->fu32ActualUsageFlags |= SVGA3D_SURFACE_HINT_VERTEXBUFFER;
         }
         else
@@ -5038 +5047 @@
                 }
                 pIndexSurface->flags |= SVGA3D_SURFACE_HINT_INDEXBUFFER;
+                pIndexSurface->fu32ActualUsageFlags |= SVGA3D_SURFACE_HINT_INDEXBUFFER;
             }
             else

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

@@ -217 +217 @@
     if (surfaceFlags & SVGA3D_SURFACE_AUTOGENMIPMAPS)
         pSurface->fUsageD3D |= D3DUSAGE_AUTOGENMIPMAP;
+    pSurface->fu32ActualUsageFlags = 0;
 #else
     vmsvga3dSurfaceFormat2OGL(pSurface, format);
@@ -443 +444 @@
     AssertReturn(pSurface && pSurface->id == sid, VERR_INVALID_PARAMETER);
 
-    AssertMsg(host.face == 0, ("host.face=%#x\n", host.face));
-    AssertReturn(pSurface->faces[0].numMipLevels > host.mipmap, VERR_INVALID_PARAMETER);
-    PVMSVGA3DMIPMAPLEVEL pMipLevel = &pSurface->pMipmapLevels[host.mipmap];
-
     if (pSurface->flags & SVGA3D_SURFACE_HINT_TEXTURE)
         Log(("vmsvga3dSurfaceDMA TEXTURE guestptr gmr=%x offset=%x pitch=%x host sid=%x face=%d mipmap=%d transfer=%s cCopyBoxes=%d\n", guest.ptr.gmrId, guest.ptr.offset, guest.pitch, host.sid, host.face, host.mipmap, (transfer == SVGA3D_WRITE_HOST_VRAM) ? "READ" : "WRITE", cCopyBoxes));
     else
         Log(("vmsvga3dSurfaceDMA guestptr gmr=%x offset=%x pitch=%x host sid=%x face=%d mipmap=%d transfer=%s cCopyBoxes=%d\n", guest.ptr.gmrId, guest.ptr.offset, guest.pitch, host.sid, host.face, host.mipmap, (transfer == SVGA3D_WRITE_HOST_VRAM) ? "READ" : "WRITE", cCopyBoxes));
+
+    AssertMsg(host.face == 0, ("host.face=%#x\n", host.face));
+    AssertMsgReturn(pSurface->faces[0].numMipLevels > host.mipmap, ("numMipLevels %d, host.mipmap %d", pSurface->faces[0].numMipLevels, host.mipmap), VERR_INVALID_PARAMETER);
+    PVMSVGA3DMIPMAPLEVEL pMipLevel = &pSurface->pMipmapLevels[host.mipmap];
 
     if (!VMSVGA3DSURFACE_HAS_HW_SURFACE(pSurface))