Changeset 94902 in vbox

Timestamp:

May 6, 2022 7:05:49 PM (3 years ago)

Author:

vboxsync

Message:

WDDM: fixed regression with older guests. bugref:9845

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/VBoxMPGaWddm.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/VBoxMPGaWddm.cpp

@@ -713 +713 @@
                     i, pPresent->pDstSubRects[i].left, pPresent->pDstSubRects[i].top, pPresent->pDstSubRects[i].right, pPresent->pDstSubRects[i].bottom));
 
-    NTSTATUS Status;
-    if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_GA_3D)
-        Status = gaPresentGA3D(pContext, pPresent);
 #ifdef VBOX_WITH_VMSVGA3D_DX
-    else if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D)
-        Status = DxgkDdiDXPresent(pContext, pPresent);
+    if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D)
+        return DxgkDdiDXPresent(pContext, pPresent);
 #endif
-    else
-        AssertFailedStmt(Status = STATUS_INVALID_PARAMETER);
-    return Status;
+    return gaPresentGA3D(pContext, pPresent);
 }
 
@@ -966 +961 @@
     SvgaFlush(pDevExt->pGa->hw.pSvga);
 
-    NTSTATUS Status;
-    if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_GA_3D)
-        Status = gaRenderGA3D(pContext, pRender);
 #ifdef VBOX_WITH_VMSVGA3D_DX
-    else if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D)
-        Status = DxgkDdiDXRender(pContext, pRender);
+    if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D)
+        return DxgkDdiDXRender(pContext, pRender);
 #endif
-    else
-        AssertFailedStmt(Status = STATUS_INVALID_PARAMETER);
-    return Status;
+    return gaRenderGA3D(pContext, pRender);
 }
 
@@ -1137 +1127 @@
            pBuildPagingBuffer->DmaSize));
 
-    NTSTATUS Status;
 #ifdef VBOX_WITH_VMSVGA3D_DX
     /** @todo Old code did not generate any paging command actually. So probably one function is enough. */
     if (SvgaIsDXSupported(pDevExt))
-        Status = DxgkDdiDXBuildPagingBuffer(pDevExt, pBuildPagingBuffer);
-    else
+        return DxgkDdiDXBuildPagingBuffer(pDevExt, pBuildPagingBuffer);
 #endif
-        Status = gaBuildPagingBufferOld(pDevExt, pBuildPagingBuffer);
-    return Status;
+    return gaBuildPagingBufferOld(pDevExt, pBuildPagingBuffer);
 }
 
@@ -1336 +1323 @@
     PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pPatch->hContext;
 
-    NTSTATUS Status;
-    if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_GA_3D)
-        Status = gaPatchGA3D(pDevExt, pPatch);
 #ifdef VBOX_WITH_VMSVGA3D_DX
-    else if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D)
-        Status = DxgkDdiDXPatch(pDevExt, pPatch);
+    if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D)
+        return DxgkDdiDXPatch(pDevExt, pPatch);
 #endif
-    else
-        AssertFailedStmt(Status = STATUS_INVALID_PARAMETER);
-    return Status;
+    return gaPatchGA3D(pDevExt, pPatch);
 }