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

Timestamp:

Jun 16, 2020 12:23:56 AM (5 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d-win.cpp: More assertions. bugref:8489

File:

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

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

@@ -1272 +1272 @@
             int rc = vmsvga3dContextFromCid(pState, pSurface->idAssociatedContext, &pAssociatedContext);
             if (RT_SUCCESS(rc))
+                AssertStmt(pAssociatedContext->pDevice, rc = VERR_INTERNAL_ERROR);
+            if (RT_SUCCESS(rc))
             {
                 IDirect3DQuery9 *pQuery;
@@ -1511 +1513 @@
         rc = vmsvga3dContextFromCid(pState, cidSrc, &pContextSrc);
         AssertRCReturn(rc, rc);
+        AssertReturn(pContextSrc->pDevice, VERR_INTERNAL_ERROR);
 
         LogFunc(("sid=%u type=%x format=%d -> create dest texture\n", sidDest, pSurfaceDest->surfaceFlags, pSurfaceDest->format));
@@ -1532 +1535 @@
         rc = vmsvga3dContextFromCid(pState, cidSrc, &pContextSrc);
         AssertRCReturn(rc, rc);
+        AssertReturn(pContextSrc->pDevice, VERR_INTERNAL_ERROR);
 
         /* Must flush the other context's 3d pipeline to make sure all drawing is complete for the surface we're about to use. */
@@ -1683 +1687 @@
             rc = vmsvga3dContextFromCid(pState, pSurfaceSrc->idAssociatedContext, &pContext);
             AssertRCReturn(rc, rc);
+            AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
             rc = vmsvga3dGetD3DSurface(pState, pContext, pSurfaceSrc, src.face, src.mipmap, true, &pD3DSurf);
@@ -1693 +1698 @@
             rc = vmsvga3dContextFromCid(pState, pSurfaceDest->idAssociatedContext, &pContext);
             AssertRCReturn(rc, rc);
+            AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
             rc = vmsvga3dGetD3DSurface(pState, pContext, pSurfaceDest, dest.face, dest.mipmap, true, &pD3DSurf);
@@ -2352 +2358 @@
         rc = vmsvga3dContextFromCid(pState, pSurface->idAssociatedContext, &pContext);
         AssertRCReturn(rc, rc);
+        AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
         /* Get the surface involved in the transfer. */
@@ -2522 +2529 @@
         rc = vmsvga3dContextFromCid(pState, cid, &pContext);
         AssertRCReturn(rc, rc);
+        AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
         /* Unknown surface type; turn it into a texture. */
@@ -3092 +3100 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     switch (type)
@@ -3169 +3178 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     pContext->state.zRange = zRange;
@@ -3241 +3251 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     for (unsigned i = 0; i < cRenderStates; i++)
@@ -3913 +3924 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     /* Save for vm state save/restore. */
@@ -4337 +4349 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     for (unsigned i = 0; i < cTextureStates; i++)
@@ -4626 +4639 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     AssertReturn((unsigned)face < SVGA3D_FACE_MAX, VERR_INVALID_PARAMETER);
@@ -4678 +4692 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     switch (pData->type)
@@ -4747 +4762 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     /* Store for vm state save/restore */
@@ -4769 +4785 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     /* Save for vm state save/restore. */
@@ -4801 +4818 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     /* Store for vm state save/restore. */
@@ -4833 +4851 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     PVMSVGA3DSURFACE pRT;
@@ -5100 +5119 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     HRESULT hr;
@@ -5417 +5437 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     /* Store for vm state save/restore. */
@@ -5447 +5468 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     AssertReturn(shid < SVGA3D_MAX_SHADER_IDS, VERR_INVALID_PARAMETER);
@@ -5599 +5621 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     if (type == SVGA3D_SHADERTYPE_VS)
@@ -5667 +5690 @@
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
     AssertRCReturn(rc, rc);
+    AssertReturn(pContext->pDevice, VERR_INTERNAL_ERROR);
 
     for (uint32_t i = 0; i < cRegisters; i++)