Changeset 64483 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

Timestamp:

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

Author:

vboxsync

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

111617

Message:

DevVGA_SVGA: fixed index/vertex buffer usage with recent Mesa

File:

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

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