Changeset 80475 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 28, 2019 12:30:03 PM (6 years ago)

Author:

vboxsync

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

132966

Message:

WDDM: remove unused VBoxMPVhwa code. bugref:9529

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Files:

• VBoxMPVhwa.cpp (modified) (7 diffs)
• VBoxMPVhwa.h (modified) (2 diffs)

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

@@ -19 +19 @@
 #include "VBoxMPVhwa.h"
 
-#ifndef VBOXVHWA_WITH_SHGSMI
-# include <iprt/semaphore.h>
-# include <iprt/asm.h>
-#endif
+#include <iprt/semaphore.h>
+#include <iprt/asm.h>
 
 #define VBOXVHWA_PRIMARY_ALLOCATION(_pSrc) ((_pSrc)->pPrimaryAllocation)
@@ -41 +39 @@
     pHdr->rc = VERR_GENERAL_FAILURE;
     pHdr->enmCmd = enmCmd;
-#ifndef VBOXVHWA_WITH_SHGSMI
     pHdr->cRefs = 1;
-#endif
-}
-
-#ifdef VBOXVHWA_WITH_SHGSMI
-static int vboxVhwaCommandSubmitHgsmi(struct _DEVICE_EXTENSION *pDevExt, HGSMIOFFSET offDr)
-{
-    VBoxHGSMIGuestWrite(pDevExt, offDr);
-    return VINF_SUCCESS;
-}
-#else
+}
+
 DECLINLINE(void) vbvaVhwaCommandRelease(PVBOXMP_DEVEXT pDevExt, VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST *pCmd)
 {
@@ -102 +91 @@
     vboxVhwaCommandSubmitAsynch(pDevExt, pCmd, vboxVhwaCompletionSetEvent, hEvent);
 }
-#endif
 
 void vboxVhwaCommandCheckCompletion(PVBOXMP_DEVEXT pDevExt)
@@ -115 +103 @@
     vboxVhwaCommandCheckCompletion(pDevExt);
     VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST *pHdr;
-#ifdef VBOXVHWA_WITH_SHGSMI
-    pHdr = (VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST *)VBoxSHGSMICommandAlloc(&pDevExt->u.primary.hgsmiAdapterHeap,
-                                                                            cbCmd + VBOXVHWACMD_HEADSIZE(),
-                                                                            HGSMI_CH_VBVA,
-                                                                            VBVA_VHWA_CMD);
-#else
     pHdr = (VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST *)VBoxHGSMIBufferAlloc(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx,
                                                                           cbCmd + VBOXVHWACMD_HEADSIZE(),
                                                                           HGSMI_CH_VBVA,
                                                                           VBVA_VHWA_CMD);
-#endif
     Assert(pHdr);
     if (!pHdr)
@@ -137 +118 @@
 void vboxVhwaCommandFree(PVBOXMP_DEVEXT pDevExt, VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST *pCmd)
 {
-#ifdef VBOXVHWA_WITH_SHGSMI
-    VBoxSHGSMICommandFree(&pDevExt->u.primary.hgsmiAdapterHeap, pCmd);
-#else
     vbvaVhwaCommandRelease(pDevExt, pCmd);
-#endif
 }
 
 int vboxVhwaCommandSubmit(PVBOXMP_DEVEXT pDevExt, VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST *pCmd)
 {
-#ifdef VBOXVHWA_WITH_SHGSMI
-    const VBOXSHGSMIHEADER* pHdr = VBoxSHGSMICommandPrepSynch(&pDevExt->u.primary.hgsmiAdapterHeap, pCmd);
-    Assert(pHdr);
-    int rc = VERR_GENERAL_FAILURE;
-    if (pHdr)
-    {
-        do
-        {
-            HGSMIOFFSET offCmd = VBoxSHGSMICommandOffset(&pDevExt->u.primary.hgsmiAdapterHeap, pHdr);
-            Assert(offCmd != HGSMIOFFSET_VOID);
-            if (offCmd != HGSMIOFFSET_VOID)
-            {
-                rc = vboxVhwaCommandSubmitHgsmi(pDevExt, offCmd);
-                AssertRC(rc);
-                if (RT_SUCCESS(rc))
-                {
-                    VBoxSHGSMICommandDoneSynch(&pDevExt->u.primary.hgsmiAdapterHeap, pHdr);
-                    AssertRC(rc);
-                    break;
-                }
-            }
-            else
-                rc = VERR_INVALID_PARAMETER;
-            /* fail to submit, cancel it */
-            VBoxSHGSMICommandCancelSynch(&pDevExt->u.primary.hgsmiAdapterHeap, pHdr);
-        } while (0);
-    }
-    else
-        rc = VERR_INVALID_PARAMETER;
-    return rc;
-#else
     RTSEMEVENT hEvent;
     int rc = RTSemEventCreate(&hEvent);
@@ -190 +136 @@
     }
     return rc;
-#endif
-}
-
-#ifndef VBOXVHWA_WITH_SHGSMI
+}
+
 /** @callback_method_impl{FNVBOXVHWACMDCOMPLETION} */
 static DECLCALLBACK(void)
@@ -216 +160 @@
 }
 
-#endif
 
 void vboxVhwaCommandSubmitAsynchAndComplete(PVBOXMP_DEVEXT pDevExt, VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST *pCmd)
 {
-#ifdef VBOXVHWA_WITH_SHGSMI
-# error "port me"
-#else
     pCmd->Flags |= VBOXVHWACMD_FLAG_GH_ASYNCH_NOCOMPLETION;
 
     vboxVhwaCommandSubmitAsynch(pDevExt, pCmd, vboxVhwaCompletionFreeCmd, NULL);
-#endif
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVhwa.h

@@ -35 +35 @@
 void vboxVhwaCommandSubmitAsynchAndComplete(PVBOXMP_DEVEXT pDevExt, VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST *pCmd);
 
-#ifndef VBOXVHWA_WITH_SHGSMI
 typedef DECLCALLBACK(void) FNVBOXVHWACMDCOMPLETION(PVBOXMP_DEVEXT pDevExt, VBOXVHWACMD RT_UNTRUSTED_VOLATILE_HOST * pCmd,
                                                    void *pvContext);
@@ -53 +52 @@
 
 void vboxVhwaCompletionListProcess(PVBOXMP_DEVEXT pDevExt, VBOXVTLIST *pList);
-#endif
 
 int vboxVhwaEnable(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId);