Changeset 83596 in vbox for trunk/src

Timestamp:

Apr 6, 2020 10:53:11 PM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics: check the resource type

File:

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

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

@@ -2528 +2528 @@
         AssertRCReturn(rc, rc);
     }
-    else
-    {
-        hr = pSurface->u.pTexture->SetAutoGenFilterType((D3DTEXTUREFILTERTYPE)filter);
-        AssertMsg(hr == D3D_OK, ("SetAutoGenFilterType failed with %x\n", hr));
-    }
+
+    AssertReturn(   pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_TEXTURE
+                 || pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_CUBE_TEXTURE
+                 || pSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_VOLUME_TEXTURE,
+                 VERR_INVALID_PARAMETER);
+
+    hr = pSurface->u.pTexture->SetAutoGenFilterType((D3DTEXTUREFILTERTYPE)filter);
+    AssertMsg(hr == D3D_OK, ("SetAutoGenFilterType failed with %x\n", hr));
 
     /* Generate the mip maps. */
@@ -4915 +4918 @@
     {
         /* The buffer object is not an vertex one. Recreate the D3D resource. */
-        Assert(pVertexSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_INDEX_BUFFER);
+        AssertReturn(pVertexSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_INDEX_BUFFER, VERR_INVALID_PARAMETER);
         D3D_RELEASE(pVertexSurface->u.pIndexBuffer);
         pVertexSurface->enmD3DResType = VMSVGA3D_D3DRESTYPE_NONE;
@@ -4970 +4973 @@
     {
         /* The buffer object is not an index one. Must recreate the D3D resource. */
-        Assert(pIndexSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_VERTEX_BUFFER);
+        AssertReturn(pIndexSurface->enmD3DResType == VMSVGA3D_D3DRESTYPE_VERTEX_BUFFER, VERR_INVALID_PARAMETER);
         D3D_RELEASE(pIndexSurface->u.pVertexBuffer);
         pIndexSurface->enmD3DResType = VMSVGA3D_D3DRESTYPE_NONE;