Changeset 95589 in vbox

Timestamp:

Jul 11, 2022 2:16:05 PM (2 years ago)

Author:

vboxsync

Message:

Devices/Graphics: cleanup. bugref:10242

File:

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

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

@@ -1544 +1544 @@
     }
 
-    Assert(pSurfaceSrc->enmD3DResType != VMSVGA3D_D3DRESTYPE_VOLUME_TEXTURE); /// @todo
-    Assert(pSurfaceDest->enmD3DResType != VMSVGA3D_D3DRESTYPE_VOLUME_TEXTURE); /// @todo
+    AssertReturn(pSurfaceSrc->enmD3DResType != VMSVGA3D_D3DRESTYPE_VOLUME_TEXTURE, VERR_NOT_IMPLEMENTED); /// @todo
+    AssertReturn(pSurfaceDest->enmD3DResType != VMSVGA3D_D3DRESTYPE_VOLUME_TEXTURE, VERR_NOT_IMPLEMENTED); /// @todo
+
+    /* Surface copy only makes sense between surfaces with identical layout. */
+    AssertReturn(pSurfaceSrc->cbBlock == pSurfaceDest->cbBlock, VERR_INVALID_PARAMETER);
+    AssertReturn(pSurfaceSrc->cxBlock == pSurfaceDest->cxBlock, VERR_INVALID_PARAMETER);
+    AssertReturn(pSurfaceSrc->cyBlock == pSurfaceDest->cyBlock, VERR_INVALID_PARAMETER);
 
     if (   pSurfaceSrc->u.pSurface
@@ -1759 +1764 @@
 
             Assert(!clipBox.srcz && !clipBox.z);
-            Assert(pSurfaceSrc->cbBlock == pSurfaceDest->cbBlock);
-            Assert(pSurfaceSrc->cxBlock == pSurfaceDest->cxBlock);
-            Assert(pSurfaceSrc->cyBlock == pSurfaceDest->cyBlock);
 
             uint32_t cBlocksX = (clipBox.w + pSurfaceSrc->cxBlock - 1) / pSurfaceSrc->cxBlock;