Changeset 80422 in vbox

Timestamp:

Aug 26, 2019 1:56:24 PM (5 years ago)

Author:

vboxsync

Message:

WDDM: remove old chromium based 3D code from the miniport driver. bugref:9529

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/common/VBoxVideoLog.h (modified) (1 diff)
• Graphics/Video/common/wddm/VBoxMPIf.h (modified) (3 diffs)
• Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp (modified) (2 diffs)
• Graphics/Video/mp/Makefile.kmk (modified) (5 diffs)
• Graphics/Video/mp/common/VBoxMPDevExt.h (modified) (1 diff)
• Graphics/Video/mp/wddm/VBoxMPCr.cpp (deleted)
• Graphics/Video/mp/wddm/VBoxMPCr.h (deleted)
• Graphics/Video/mp/wddm/VBoxMPCrUtil.cpp (deleted)
• Graphics/Video/mp/wddm/VBoxMPMisc.cpp (modified) (2 diffs)
• Graphics/Video/mp/wddm/VBoxMPMisc.h (modified) (2 diffs)
• Graphics/Video/mp/wddm/VBoxMPSa.cpp (modified) (1 diff)
• Graphics/Video/mp/wddm/VBoxMPTypes.h (modified) (5 diffs)
• Graphics/Video/mp/wddm/VBoxMPVbva.cpp (modified) (3 diffs)
• Graphics/Video/mp/wddm/VBoxMPVbva.h (modified) (1 diff)
• Graphics/Video/mp/wddm/VBoxMPVdma.cpp (modified) (6 diffs)
• Graphics/Video/mp/wddm/VBoxMPVdma.h (modified) (2 diffs)
• Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (43 diffs)
• Graphics/Video/mp/wddm/VBoxMPWddm.h (modified) (1 diff)
• Graphics/Video/mp/wddm/gallium/VBoxMPGaWddm.cpp (modified) (3 diffs)
• include/VBoxDisplay.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/VBoxVideoLog.h

@@ -66 +66 @@
 #endif
 
-#ifdef DEBUG_misha
+#ifdef DEBUG_sunlover
 # define BP_WARN() AssertFailed()
 #else

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -254 +254 @@
     VBOXWDDM_CONTEXT_TYPE_SYSTEM,
     /* context created by the D3D User-mode driver when crogl IS available */
-    VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D,
+    obsolete_VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D,
     /* context created by the D3D User-mode driver when crogl is NOT available or for ddraw overlay acceleration */
-    VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D,
+    obsolete_VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D,
     /* contexts created by the cromium HGSMI transport for HGSMI commands submission */
-    VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_3D,
-    VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL,
+    obsolete_VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_3D,
+    obsolete_VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL,
     /* context created by the kernel->user communication mechanism for visible rects reporting, etc.  */
     VBOXWDDM_CONTEXT_TYPE_CUSTOM_SESSION,
@@ -475 +475 @@
 } VBOXVIDEOCM_UM_ALLOC, *PVBOXVIDEOCM_UM_ALLOC;
 
-typedef struct VBOXDISPIFESCAPE_UHGSMI_ALLOCATE
-{
-    VBOXDISPIFESCAPE EscapeHdr;
-    VBOXVIDEOCM_UM_ALLOC Alloc;
-} VBOXDISPIFESCAPE_UHGSMI_ALLOCATE, *PVBOXDISPIFESCAPE_UHGSMI_ALLOCATE;
-
-typedef struct VBOXDISPIFESCAPE_UHGSMI_DEALLOCATE
-{
-    VBOXDISPIFESCAPE EscapeHdr;
-    VBOXDISP_KMHANDLE hAlloc;
-} VBOXDISPIFESCAPE_UHGSMI_DEALLOCATE, *PVBOXDISPIFESCAPE_UHGSMI_DEALLOCATE;
-
-typedef struct VBOXWDDM_UHGSMI_BUFFER_UI_INFO_ESCAPE
-{
-    VBOXDISP_KMHANDLE hAlloc;
-    VBOXWDDM_UHGSMI_BUFFER_UI_SUBMIT_INFO Info;
-} VBOXWDDM_UHGSMI_BUFFER_UI_INFO_ESCAPE, *PVBOXWDDM_UHGSMI_BUFFER_UI_INFO_ESCAPE;
-
-typedef struct VBOXDISPIFESCAPE_UHGSMI_SUBMIT
-{
-    VBOXDISPIFESCAPE EscapeHdr;
-    VBOXWDDM_UHGSMI_BUFFER_UI_INFO_ESCAPE aBuffers[1];
-} VBOXDISPIFESCAPE_UHGSMI_SUBMIT, *PVBOXDISPIFESCAPE_UHGSMI_SUBMIT;
-
 typedef struct VBOXDISPIFESCAPE_SHRC_REF
 {
@@ -513 +489 @@
 
 } VBOXDISPIFESCAPE_SETALLOCHOSTID, *PVBOXDISPIFESCAPE_SETALLOCHOSTID;
-
-typedef struct VBOXDISPIFESCAPE_CRHGSMICTLCON_CALL
-{
-    VBOXDISPIFESCAPE EscapeHdr;
-    VBGLIOCHGCMCALL CallInfo;
-} VBOXDISPIFESCAPE_CRHGSMICTLCON_CALL, *PVBOXDISPIFESCAPE_CRHGSMICTLCON_CALL;
 
 #ifdef VBOX_WITH_MESA3D

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp

@@ -368 +368 @@
 }
 
+/// @todo Used for resize and seamless. Drop crVersion* params.
 HRESULT vboxDispKmtCreateContext(PVBOXDISPKMT_DEVICE pDevice, PVBOXDISPKMT_CONTEXT pContext,
                                     VBOXWDDM_CONTEXT_TYPE enmType,
@@ -386 +387 @@
     ContextData.pPrivateDriverData = &Info;
     ContextData.PrivateDriverDataSize = sizeof (Info);
-    ContextData.ClientHint = enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL ? D3DKMT_CLIENTHINT_OPENGL : D3DKMT_CLIENTHINT_DX9;
+    ContextData.ClientHint = D3DKMT_CLIENTHINT_DX9;
     NTSTATUS Status = pDevice->pAdapter->pCallbacks->pfnD3DKMTCreateContext(&ContextData);
     Assert(!Status);

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

@@ -92 +92 @@
   VBoxWddm_DEFS           += VBOX_WITH_VDMA
  endif
- ifdef VBOX_WITH_CRHGSMI
-  VBoxWddm_DEFS           += VBOX_WITH_CRHGSMI
- endif
  VBoxWddm_DEFS            += LOG_TO_BACKDOOR
  VBoxWddm_DEFS            += VBOX_SVN_REV=$(VBOX_SVN_REV)
@@ -104 +101 @@
         .. \
         . \
-        $(VBOX_PATH_CROGL_INCLUDE) \
-        $(VBOX_PATH_CROGL_GENFILES) \
-        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer \
         $(VBOX_GRAPHICS_INCS)
 
@@ -112 +106 @@
  VBoxWddm_LDFLAGS.amd64   += /Entry:DriverEntry
 
- VBoxWddm_INTERMEDIATES = \
-        $(VBOX_PATH_CROGL_GENFILES)/cr_packfunctions.h \
-        $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h \
-        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
-        $(VBOX_PATH_CROGL_GENFILES)/cr_packfunctions.h
  VBoxWddm_SOURCES          = \
         wddm/VBoxMPWddm.cpp \
@@ -123 +112 @@
         wddm/VBoxMPShgsmi.cpp \
         wddm/VBoxMPCm.cpp \
-        wddm/VBoxMPCr.cpp \
         wddm/VBoxMPSa.cpp \
         wddm/VBoxMPMisc.cpp \
@@ -139 +127 @@
 
  if defined(VBOX_WITH_CROGL)
-   VBoxWddm_SOURCES       += \
-        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/util/vreg.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer/pack_buffer.c \
-        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer/pack_bounds.c \
-        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c \
-        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer/pack_misc.c \
-        $(VBOX_PATH_CROGL_GENFILES)/packer.c \
-        wddm/VBoxMPCrUtil.cpp
    VBoxWddm_DEFS          += VBOX_WITH_CROGL
  endif

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

@@ -146 +146 @@
 
    DWORD dwDrvCfgFlags;
-#ifdef VBOX_WITH_CROGL
+
    BOOLEAN f3DEnabled;
-   BOOLEAN fTexPresentEnabled;
    BOOLEAN fCmdVbvaEnabled;
    BOOLEAN fComplexTopologiesEnabled;
 
-   uint32_t u32CrConDefaultClientID;
-
    VBOXCMDVBVA CmdVbva;
 
-   VBOXMP_CRCTLCON CrCtlCon;
-   VBOXMP_CRSHGSMITRANSPORT CrHgsmiTransport;
-#endif
    VBOXWDDM_GLOBAL_POINTER_INFO PointerInfo;
 

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

@@ -179 +179 @@
     return NULL;
 }
-#ifdef VBOX_WITH_CROGL
-PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainCreate(UINT w, UINT h)
-{
-    PVBOXWDDM_SWAPCHAIN pSwapchain = (PVBOXWDDM_SWAPCHAIN)vboxWddmMemAllocZero(sizeof (VBOXWDDM_SWAPCHAIN));
-    Assert(pSwapchain);
-    if (pSwapchain)
-    {
-        InitializeListHead(&pSwapchain->AllocList);
-        pSwapchain->enmState = VBOXWDDM_OBJSTATE_TYPE_INITIALIZED;
-        pSwapchain->cRefs = 1;
-        /* init to some invalid value so that the pos get submitted */
-        pSwapchain->Pos.x = pSwapchain->Pos.y = VBOXWDDM_INVALID_COORD;
-        pSwapchain->width = w;
-        pSwapchain->height = h;
-        VBoxVrListInit(&pSwapchain->VisibleRegions);
-    }
-    return pSwapchain;
-}
-
-DECLINLINE(BOOLEAN) vboxWddmSwapchainRetainLocked(PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    if (pSwapchain->enmState == VBOXWDDM_OBJSTATE_TYPE_INITIALIZED)
-    {
-        ASMAtomicIncU32(&pSwapchain->cRefs);
-        return TRUE;
-    }
-    return FALSE;
-}
-
-BOOLEAN vboxWddmSwapchainRetain(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    KIRQL OldIrql;
-    BOOLEAN bRc;
-    KeAcquireSpinLock(&pDevExt->SynchLock, &OldIrql);
-    bRc = vboxWddmSwapchainRetainLocked(pSwapchain);
-    KeReleaseSpinLock(&pDevExt->SynchLock, OldIrql);
-    return bRc;
-}
-
-VOID vboxWddmSwapchainRelease(PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    const uint32_t cRefs = ASMAtomicDecU32(&pSwapchain->cRefs);
-    Assert(cRefs < UINT32_MAX/2);
-    if (!cRefs)
-    {
-        VBoxVrListClear(&pSwapchain->VisibleRegions);
-        vboxWddmMemFree(pSwapchain);
-    }
-}
-
-PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAllocData(PVBOXMP_DEVEXT pDevExt, const struct VBOXWDDM_ALLOC_DATA *pAllocData)
-{
-    KIRQL OldIrql;
-    PVBOXWDDM_SWAPCHAIN pSwapchain;
-    KeAcquireSpinLock(&pDevExt->SynchLock, &OldIrql);
-    pSwapchain = pAllocData->pSwapchain;
-    if (pSwapchain && !vboxWddmSwapchainRetainLocked(pSwapchain))
-        pSwapchain = NULL;
-    KeReleaseSpinLock(&pDevExt->SynchLock, OldIrql);
-    return pSwapchain;
-}
-
-PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOCATION *pAlloc)
-{
-    return vboxWddmSwapchainRetainByAllocData(pDevExt, &pAlloc->AllocData);
-}
-
-VOID vboxWddmSwapchainAllocRemove(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain, PVBOXWDDM_ALLOCATION pAlloc)
-{
-    KIRQL OldIrql;
-    KeAcquireSpinLock(&pDevExt->SynchLock, &OldIrql);
-    Assert(pAlloc->AllocData.pSwapchain == pSwapchain);
-    pAlloc->AllocData.pSwapchain = NULL;
-    RemoveEntryList(&pAlloc->SwapchainEntry);
-    KeReleaseSpinLock(&pDevExt->SynchLock, OldIrql);
-    vboxWddmSwapchainRelease(pSwapchain);
-}
-
-BOOLEAN vboxWddmSwapchainAllocAdd(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain, PVBOXWDDM_ALLOCATION pAlloc)
-{
-    KIRQL OldIrql;
-    BOOLEAN bRc;
-    Assert(!pAlloc->AllocData.pSwapchain);
-    KeAcquireSpinLock(&pDevExt->SynchLock, &OldIrql);
-    bRc = vboxWddmSwapchainRetainLocked(pSwapchain);
-    if (bRc)
-    {
-        if (pAlloc->AllocData.pSwapchain)
-        {
-            RemoveEntryList(&pAlloc->SwapchainEntry);
-        }
-        InsertTailList(&pSwapchain->AllocList, &pAlloc->SwapchainEntry);
-        pAlloc->AllocData.pSwapchain = pSwapchain;
-    }
-    KeReleaseSpinLock(&pDevExt->SynchLock, OldIrql);
-    return bRc;
-}
-
-#define VBOXSCENTRY_2_ALLOC(_pE) ((PVBOXWDDM_ALLOCATION)((uint8_t*)(_pE) - RT_UOFFSETOF(VBOXWDDM_ALLOCATION, SwapchainEntry)))
-
-static VOID vboxWddmSwapchainAllocRemoveAllInternal(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain, BOOLEAN bOnDestroy)
-{
-    KIRQL OldIrql;
-    UINT cRemoved = 0;
-    KeAcquireSpinLock(&pDevExt->SynchLock, &OldIrql);
-    PLIST_ENTRY pEntry = pSwapchain->AllocList.Flink;
-    do
-    {
-        if (pEntry != &pSwapchain->AllocList)
-        {
-            PVBOXWDDM_ALLOCATION pAlloc = VBOXSCENTRY_2_ALLOC(pEntry);
-            pEntry = pEntry->Flink;
-            Assert(pAlloc->AllocData.pSwapchain == pSwapchain);
-            pAlloc->AllocData.pSwapchain = NULL;
-            RemoveEntryList(&pAlloc->SwapchainEntry);
-            ++cRemoved;
-        }
-        else
-            break;
-    } while (1);
-
-    if (bOnDestroy)
-        pSwapchain->enmState = VBOXWDDM_OBJSTATE_TYPE_TERMINATED;
-    KeReleaseSpinLock(&pDevExt->SynchLock, OldIrql);
-
-    for (UINT i = 0; i < cRemoved; ++i)
-        vboxWddmSwapchainRelease(pSwapchain);
-}
-
-VOID vboxWddmSwapchainAllocRemoveAll(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    vboxWddmSwapchainAllocRemoveAllInternal(pDevExt, pSwapchain, FALSE);
-}
-
-VOID vboxWddmSwapchainDestroy(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    vboxWddmSwapchainAllocRemoveAllInternal(pDevExt, pSwapchain, TRUE);
-
-    vboxWddmSwapchainRelease(pSwapchain);
-}
-
-static BOOLEAN vboxWddmSwapchainCtxAddLocked(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    if (vboxWddmSwapchainRetain(pDevExt, pSwapchain))
-    {
-        Assert(!pSwapchain->hSwapchainKm);
-        Assert(!pSwapchain->pContext);
-        pSwapchain->pContext = pContext;
-        pSwapchain->hSwapchainKm = vboxWddmHTablePut(&pContext->Swapchains, pSwapchain);
-        InsertHeadList(&pDevExt->SwapchainList3D, &pSwapchain->DevExtListEntry);
-        return TRUE;
-    }
-    return FALSE;
-}
-
-static VOID vboxWddmSwapchainCtxRemoveLocked(PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    Assert(pSwapchain->hSwapchainKm);
-    Assert(pSwapchain->pContext);
-    void *pvTst = vboxWddmHTableRemove(&pContext->Swapchains, pSwapchain->hSwapchainKm);
-    Assert((PVBOXWDDM_SWAPCHAIN)pvTst == pSwapchain); NOREF(pvTst);
-    RemoveEntryList(&pSwapchain->DevExtListEntry);
-    pSwapchain->hSwapchainKm = NULL;
-    VBoxVrListClear(&pSwapchain->VisibleRegions);
-    vboxWddmSwapchainRelease(pSwapchain);
-}
-
-/* adds the given swapchain to the context's swapchain list
- * @return true on success */
-BOOLEAN vboxWddmSwapchainCtxAdd(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    BOOLEAN bRc;
-    VBOXWDDM_CTXLOCK_DATA
-    VBOXWDDM_CTXLOCK_LOCK(pDevExt);
-    bRc = vboxWddmSwapchainCtxAddLocked(pDevExt, pContext, pSwapchain);
-    VBOXWDDM_CTXLOCK_UNLOCK(pDevExt);
-    return bRc;
-}
-
-/* removes the given swapchain from the context's swapchain list
- * */
-VOID vboxWddmSwapchainCtxRemove(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    VBOXWDDM_CTXLOCK_DATA
-    VBOXWDDM_CTXLOCK_LOCK(pDevExt);
-    vboxWddmSwapchainCtxRemoveLocked(pContext, pSwapchain);
-    VBOXWDDM_CTXLOCK_UNLOCK(pDevExt);
-}
-
-/* destroys all swapchains for the given context
- * */
-VOID vboxWddmSwapchainCtxDestroyAll(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext)
-{
-    VBOXWDDM_HTABLE_ITERATOR Iter;
-    VBOXWDDM_CTXLOCK_DATA
-    do
-    {
-        VBOXWDDM_CTXLOCK_LOCK(pDevExt);
-        vboxWddmHTableIterInit(&pContext->Swapchains, &Iter);
-        PVBOXWDDM_SWAPCHAIN pSwapchain = (PVBOXWDDM_SWAPCHAIN)vboxWddmHTableIterNext(&Iter, NULL);
-        if (!pSwapchain)
-            break;
-
-        /* yes, we can call remove locked even when using iterator */
-        vboxWddmSwapchainCtxRemoveLocked(pContext, pSwapchain);
-
-        VBOXWDDM_CTXLOCK_UNLOCK(pDevExt);
-        /* we must not do vboxWddmSwapchainDestroy inside a context mutex */
-        vboxWddmSwapchainDestroy(pDevExt, pSwapchain);
-        /* start from the very beginning, we will quit the loop when no swapchains left */
-    } while (1);
-
-    /* no swapchains left, we exiteed the while loop via the "break", and we still owning the mutex */
-    VBOXWDDM_CTXLOCK_UNLOCK(pDevExt);
-}
-
-/* process the swapchain info passed from user-mode display driver & synchronizes the driver state with it */
-NTSTATUS vboxWddmSwapchainCtxEscape(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext,
-                                    PVBOXDISPIFESCAPE_SWAPCHAININFO pSwapchainInfo, UINT cbSize)
-{
-    if (cbSize < RT_UOFFSETOF(VBOXDISPIFESCAPE_SWAPCHAININFO, SwapchainInfo.ahAllocs[0]))
-    {
-        WARN(("invalid cbSize1 %d", cbSize));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    if (cbSize < RT_UOFFSETOF_DYN(VBOXDISPIFESCAPE_SWAPCHAININFO, SwapchainInfo.ahAllocs[pSwapchainInfo->SwapchainInfo.cAllocs]))
-    {
-        WARN(("invalid cbSize2 %d", cbSize));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    if (!pSwapchainInfo->SwapchainInfo.winHostID)
-    {
-        WARN(("Zero winHostID specified!"));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    if (!pContext)
-    {
-        WARN(("vboxWddmSwapchainCtxEscape: no context specified"));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    PVBOXWDDM_SWAPCHAIN pSwapchain = NULL;
-    PVBOXWDDM_ALLOCATION *apAlloc = NULL;
-    Assert(KeGetCurrentIrql() == PASSIVE_LEVEL);
-    NTSTATUS Status = STATUS_SUCCESS;
-    VBOXWDDM_CTXLOCK_DATA
-
-    do {
-        if (pSwapchainInfo->SwapchainInfo.cAllocs)
-        {
-            /* ensure we do not overflow the 32bit buffer size value */
-            if (VBOXWDDM_ARRAY_MAXELEMENTSU32(VBOXWDDM_ALLOCATION) < pSwapchainInfo->SwapchainInfo.cAllocs)
-            {
-                WARN(("number of allocations passed in too big (%d), max is (%d)",
-                      pSwapchainInfo->SwapchainInfo.cAllocs, VBOXWDDM_ARRAY_MAXELEMENTSU32(VBOXWDDM_ALLOCATION)));
-                Status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-
-            apAlloc = (PVBOXWDDM_ALLOCATION *)vboxWddmMemAlloc(  sizeof(PVBOXWDDM_ALLOCATION)
-                                                               * pSwapchainInfo->SwapchainInfo.cAllocs);
-            Assert(apAlloc);
-            if (!apAlloc)
-            {
-                Status = STATUS_NO_MEMORY;
-                break;
-            }
-            for (UINT i = 0; i < pSwapchainInfo->SwapchainInfo.cAllocs; ++i)
-            {
-                DXGKARGCB_GETHANDLEDATA GhData;
-                GhData.hObject = pSwapchainInfo->SwapchainInfo.ahAllocs[i];
-                GhData.Type = DXGK_HANDLE_ALLOCATION;
-                GhData.Flags.Value = 0;
-                PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pDevExt->u.primary.DxgkInterface.DxgkCbGetHandleData(&GhData);
-                Assert(pAlloc);
-                if (!pAlloc)
-                {
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-                apAlloc[i] = pAlloc;
-            }
-
-            if (!NT_SUCCESS(Status))
-                break;
-        }
-
-        if (pSwapchainInfo->SwapchainInfo.hSwapchainKm)
-        {
-            VBOXWDDM_CTXLOCK_LOCK(pDevExt);
-            pSwapchain = (PVBOXWDDM_SWAPCHAIN)vboxWddmHTableGet(&pContext->Swapchains,
-                                                                (VBOXWDDM_HANDLE)pSwapchainInfo->SwapchainInfo.hSwapchainKm);
-            Assert(pSwapchain);
-            if (!pSwapchain)
-            {
-                VBOXWDDM_CTXLOCK_UNLOCK(pDevExt);
-                Status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-            Assert(pSwapchain->hSwapchainKm == pSwapchainInfo->SwapchainInfo.hSwapchainKm);
-            Assert(pSwapchain->pContext == pContext);
-            if (pSwapchain->pContext != pContext)
-            {
-                VBOXWDDM_CTXLOCK_UNLOCK(pDevExt);
-                Status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-        }
-        else if (pSwapchainInfo->SwapchainInfo.cAllocs)
-        {
-            pSwapchain = vboxWddmSwapchainCreate(apAlloc[0]->AllocData.SurfDesc.width, apAlloc[0]->AllocData.SurfDesc.height);
-            if (!pSwapchain)
-            {
-                Status = STATUS_NO_MEMORY;
-                break;
-            }
-
-            VBOXWDDM_CTXLOCK_LOCK(pDevExt);
-            BOOLEAN fRc = vboxWddmSwapchainCtxAddLocked(pDevExt, pContext, pSwapchain);
-            Assert(fRc); NOREF(fRc);
-        }
-        else
-        {
-            Status = STATUS_INVALID_PARAMETER;
-            break;
-        }
-
-        /* do not zero up the view rect since it may still be valid */
-//        memset(&pSwapchain->ViewRect, 0, sizeof (pSwapchain->ViewRect));
-        /** @todo do we really need to zero this up here ? */
-        VBoxVrListClear(&pSwapchain->VisibleRegions);
-
-        vboxWddmSwapchainAllocRemoveAll(pDevExt, pSwapchain);
-
-        if (pSwapchainInfo->SwapchainInfo.cAllocs)
-        {
-            for (UINT i = 0; i < pSwapchainInfo->SwapchainInfo.cAllocs; ++i)
-            {
-                vboxWddmSwapchainAllocAdd(pDevExt, pSwapchain, apAlloc[i]);
-            }
-            pSwapchain->hSwapchainUm = pSwapchainInfo->SwapchainInfo.hSwapchainUm;
-            if (pSwapchain->winHostID != pSwapchainInfo->SwapchainInfo.winHostID)
-            {
-                pSwapchain->fExposed = FALSE;
-                pSwapchain->winHostID = pSwapchainInfo->SwapchainInfo.winHostID;
-            }
-        }
-        else
-        {
-            vboxWddmSwapchainCtxRemoveLocked(pContext, pSwapchain);
-        }
-
-        VBOXWDDM_CTXLOCK_UNLOCK(pDevExt);
-
-        if (pSwapchainInfo->SwapchainInfo.cAllocs)
-        {
-            Assert(pSwapchain->pContext);
-            Assert(pSwapchain->hSwapchainKm);
-            pSwapchainInfo->SwapchainInfo.hSwapchainKm = pSwapchain->hSwapchainKm;
-        }
-        else
-        {
-            vboxWddmSwapchainDestroy(pDevExt, pSwapchain);
-            pSwapchainInfo->SwapchainInfo.hSwapchainKm = 0;
-        }
-
-        AssertNtStatusSuccess(Status);
-    } while (0);
-
-    /* cleanup */
-    if (apAlloc)
-        vboxWddmMemFree(apAlloc);
-
-    return Status;
-}
-
-NTSTATUS vboxWddmSwapchainCtxInit(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext)
-{
-    RT_NOREF(pDevExt);
-    NTSTATUS Status = vboxWddmHTableCreate(&pContext->Swapchains, 4);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxWddmHTableCreate failes, Status (x%x)", Status));
-        return Status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-VOID vboxWddmSwapchainCtxTerm(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext)
-{
-    vboxWddmSwapchainCtxDestroyAll(pDevExt, pContext);
-    vboxWddmHTableDestroy(&pContext->Swapchains);
-}
-#endif
+
 NTSTATUS vboxWddmRegQueryDrvKeyName(PVBOXMP_DEVEXT pDevExt, ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult)
 {
@@ -1355 +958 @@
 }
 
-#ifdef VBOX_WITH_CRHGSMI
-static DECLCALLBACK(VOID) vboxVideoAMgrAllocSubmitCompletion(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext)
-{
-    RT_NOREF(pCmd);
-    /* we should be called from our DPC routine */
-    Assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
-
-    PVBOXVDMACBUF_DR pDr = (PVBOXVDMACBUF_DR)pvContext;
-    VBOXVDMACMD              RT_UNTRUSTED_VOLATILE_HOST *pHdr  = VBOXVDMACBUF_DR_TAIL(pDr, VBOXVDMACMD);
-    VBOXVDMACMD_CHROMIUM_CMD RT_UNTRUSTED_VOLATILE_HOST *pBody = VBOXVDMACMD_BODY(pHdr, VBOXVDMACMD_CHROMIUM_CMD);
-    UINT cBufs = pBody->cBuffers;
-    for (UINT i = 0; i < cBufs; ++i)
-    {
-        VBOXVDMACMD_CHROMIUM_BUFFER RT_UNTRUSTED_VOLATILE_HOST *pBufCmd = &pBody->aBuffers[i];
-        PVBOXVIDEOCM_ALLOC_REF pRef = (PVBOXVIDEOCM_ALLOC_REF)pBufCmd->u64GuestData;
-        if (!pBufCmd->u32GuestData)
-        {
-            /* signal completion */
-            if (pRef->pSynchEvent)
-                KeSetEvent(pRef->pSynchEvent, 3, FALSE);
-        }
-
-        vboxVideoAMgrCtxAllocRefRelease(pRef);
-    }
-
-    vboxVdmaCBufDrFree(&pDevExt->u.primary.Vdma, pDr);
-}
-
-/* submits a set of chromium uhgsmi buffers to host for processing */
-NTSTATUS vboxVideoAMgrCtxAllocSubmit(PVBOXMP_DEVEXT pDevExt, PVBOXVIDEOCM_ALLOC_CONTEXT pContext, UINT cBuffers,
-                                     VBOXWDDM_UHGSMI_BUFFER_UI_INFO_ESCAPE *paBuffers)
-{
-    /* ensure we do not overflow the 32bit buffer size value */
-    if (VBOXWDDM_TRAILARRAY_MAXELEMENTSU32(VBOXVDMACMD_CHROMIUM_CMD, aBuffers) < cBuffers)
-    {
-        WARN(("number of buffers passed too big (%d), max is (%d)",
-              cBuffers, VBOXWDDM_TRAILARRAY_MAXELEMENTSU32(VBOXVDMACMD_CHROMIUM_CMD, aBuffers)));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    NTSTATUS Status = STATUS_SUCCESS;
-    UINT cbCmd = VBOXVDMACMD_SIZE_FROMBODYSIZE(RT_UOFFSETOF_DYN(VBOXVDMACMD_CHROMIUM_CMD, aBuffers[cBuffers]));
-
-    VBOXVDMACBUF_DR RT_UNTRUSTED_VOLATILE_HOST *pDr = vboxVdmaCBufDrCreate(&pDevExt->u.primary.Vdma, cbCmd);
-    if (pDr)
-    {
-        // vboxVdmaCBufDrCreate zero initializes the pDr
-        pDr->fFlags = VBOXVDMACBUF_FLAG_BUF_FOLLOWS_DR;
-        pDr->cbBuf = cbCmd;
-        pDr->rc = VERR_NOT_IMPLEMENTED;
-
-        VBOXVDMACMD RT_UNTRUSTED_VOLATILE_HOST *pHdr = VBOXVDMACBUF_DR_TAIL(pDr, VBOXVDMACMD);
-        pHdr->enmType = VBOXVDMACMD_TYPE_CHROMIUM_CMD;
-        pHdr->u32CmdSpecific = 0;
-
-        VBOXVDMACMD_CHROMIUM_CMD RT_UNTRUSTED_VOLATILE_HOST *pBody = VBOXVDMACMD_BODY(pHdr, VBOXVDMACMD_CHROMIUM_CMD);
-        pBody->cBuffers = cBuffers;
-        for (UINT i = 0; i < cBuffers; ++i)
-        {
-            VBOXVDMACMD_CHROMIUM_BUFFER RT_UNTRUSTED_VOLATILE_HOST *pBufCmd = &pBody->aBuffers[i];
-            VBOXWDDM_UHGSMI_BUFFER_UI_INFO_ESCAPE *pBufInfo = &paBuffers[i];
-            PVBOXVIDEOCM_ALLOC_REF pRef = vboxVideoAMgrCtxAllocRefAcquire(pContext, pBufInfo->hAlloc);
-            if (pRef)
-            {
-#ifdef DEBUG_misha
-                Assert(pRef->cRefs == 2);
-#endif
-                pBufCmd->offBuffer = pRef->pAlloc->offData + pBufInfo->Info.offData;
-                pBufCmd->cbBuffer = pBufInfo->Info.cbData;
-                pBufCmd->u32GuestData = 0;
-                pBufCmd->u64GuestData = (uintptr_t)pRef;
-            }
-            else
-            {
-                WARN(("vboxVideoAMgrCtxAllocRefAcquire failed for hAlloc(0x%x)\n", pBufInfo->hAlloc));
-                /* release all previously acquired aloc references */
-                for (UINT j = 0; j < i; ++j)
-                {
-                    VBOXVDMACMD_CHROMIUM_BUFFER RT_UNTRUSTED_VOLATILE_HOST *pBufCmdJ = &pBody->aBuffers[j];
-                    PVBOXVIDEOCM_ALLOC_REF pRefJ = (PVBOXVIDEOCM_ALLOC_REF)pBufCmdJ;
-                    vboxVideoAMgrCtxAllocRefRelease(pRefJ);
-                }
-                Status = STATUS_INVALID_PARAMETER;
-                break;
-            }
-        }
-
-        if (Status == STATUS_SUCCESS)
-        {
-            PVBOXVDMADDI_CMD pDdiCmd = VBOXVDMADDI_CMD_FROM_BUF_DR(pDr);
-            vboxVdmaDdiCmdInit(pDdiCmd, 0, 0, vboxVideoAMgrAllocSubmitCompletion, (void *)pDr);
-            /* mark command as submitted & invisible for the dx runtime since dx did not originate it */
-            vboxVdmaDdiCmdSubmittedNotDx(pDdiCmd);
-            int rc = vboxVdmaCBufDrSubmit(pDevExt, &pDevExt->u.primary.Vdma, pDr);
-            if (RT_SUCCESS(rc))
-            {
-                return STATUS_SUCCESS;
-            }
-
-            WARN(("vboxVdmaCBufDrSubmit failed with rc (%d)\n", rc));
-
-            /* failure branch */
-            /* release all previously acquired aloc references */
-            for (UINT i = 0; i < cBuffers; ++i)
-            {
-                VBOXVDMACMD_CHROMIUM_BUFFER RT_UNTRUSTED_VOLATILE_HOST *pBufCmd = &pBody->aBuffers[i];
-                PVBOXVIDEOCM_ALLOC_REF pRef = (PVBOXVIDEOCM_ALLOC_REF)pBufCmd;
-                vboxVideoAMgrCtxAllocRefRelease(pRef);
-            }
-        }
-
-        vboxVdmaCBufDrFree(&pDevExt->u.primary.Vdma, pDr);
-    }
-    else
-    {
-        Assert(0);
-        /** @todo try flushing.. */
-        LOGREL(("vboxVdmaCBufDrCreate returned NULL"));
-        Status = STATUS_INSUFFICIENT_RESOURCES;
-    }
-
-    return Status;
-}
-#endif
-
 NTSTATUS vboxVideoAMgrCreate(PVBOXMP_DEVEXT pDevExt, PVBOXVIDEOCM_ALLOC_MGR pMgr, uint32_t offData, uint32_t cbData)
 {

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

@@ -72 +72 @@
 PVOID vboxWddmHTableGet(PVBOXWDDM_HTABLE pTbl, VBOXWDDM_HANDLE hHandle);
 
-#ifdef VBOX_WITH_CROGL
-PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainCreate();
-BOOLEAN vboxWddmSwapchainRetain(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain);
-VOID vboxWddmSwapchainRelease(PVBOXWDDM_SWAPCHAIN pSwapchain);
-PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOCATION *pAlloc);
-PVBOXWDDM_SWAPCHAIN vboxWddmSwapchainRetainByAllocData(PVBOXMP_DEVEXT pDevExt, const struct VBOXWDDM_ALLOC_DATA *pAllocData);
-VOID vboxWddmSwapchainAllocRemove(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain, PVBOXWDDM_ALLOCATION pAlloc);
-BOOLEAN vboxWddmSwapchainAllocAdd(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain, PVBOXWDDM_ALLOCATION pAlloc);
-VOID vboxWddmSwapchainAllocRemoveAll(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain);
-VOID vboxWddmSwapchainDestroy(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_SWAPCHAIN pSwapchain);
-VOID vboxWddmSwapchainCtxDestroyAll(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext);
-NTSTATUS vboxWddmSwapchainCtxEscape(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext, PVBOXDISPIFESCAPE_SWAPCHAININFO pSwapchainInfo, UINT cbSize);
-NTSTATUS vboxWddmSwapchainCtxInit(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext);
-VOID vboxWddmSwapchainCtxTerm(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_CONTEXT pContext);
-#endif
-
-
 NTSTATUS vboxWddmRegQueryDisplaySettingsKeyName(PVBOXMP_DEVEXT pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId,
         ULONG cbBuf, PWCHAR pBuf, PULONG pcbResult);
@@ -155 +138 @@
 NTSTATUS vboxVideoAMgrCtxAllocDestroy(PVBOXVIDEOCM_ALLOC_CONTEXT pContext, VBOXDISP_KMHANDLE hSesionHandle);
 
-#ifdef VBOX_WITH_CRHGSMI
-NTSTATUS vboxVideoAMgrCtxAllocSubmit(PVBOXMP_DEVEXT pDevExt, PVBOXVIDEOCM_ALLOC_CONTEXT pContext, UINT cBuffers, VBOXWDDM_UHGSMI_BUFFER_UI_INFO_ESCAPE *paBuffers);
-#endif
-
 VOID vboxWddmSleep(uint32_t u32Val);
 VOID vboxWddmCounterU32Wait(uint32_t volatile * pu32, uint32_t u32Val);

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

@@ -17 +17 @@
  */
 
-#include <cr_error.h>
+#include "common/VBoxMPUtils.h"
 #include <iprt/err.h>
 #include <iprt/mem.h>

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

@@ -35 +35 @@
 #include "VBoxMPShgsmi.h"
 #include "VBoxMPVbva.h"
-#include "VBoxMPCr.h"
 #include "VBoxMPSa.h"
 #include "VBoxMPVModes.h"
-
-#ifdef VBOX_WITH_CROGL
-#include <cr_vreg.h>
-#endif
 
 #if 0
@@ -136 +131 @@
     BOOLEAN bVisible;
     BOOLEAN bBlankedByPowerOff;
-#ifdef VBOX_WITH_CROGL
-    /* specifies whether the source has 3D overlay data visible */
-    BOOLEAN fHas3DVrs;
-    VBOXVR_LIST VrList;
-#endif
     VBOXVBVAINFO Vbva;
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -250 +240 @@
 #define VBOXWDDM_INVALID_COORD ((LONG)((~0UL) >> 1))
 
-#ifdef VBOX_WITH_CROGL
-typedef struct VBOXWDDM_SWAPCHAIN
-{
-    LIST_ENTRY DevExtListEntry;
-    LIST_ENTRY AllocList;
-    struct VBOXWDDM_CONTEXT *pContext;
-    VBOXWDDM_OBJSTATE_TYPE enmState;
-    volatile uint32_t cRefs;
-    VBOXDISP_UMHANDLE hSwapchainUm;
-    VBOXDISP_KMHANDLE hSwapchainKm;
-    int32_t winHostID;
-    BOOLEAN fExposed;
-    POINT Pos;
-    UINT width;
-    UINT height;
-    VBOXVR_LIST VisibleRegions;
-}VBOXWDDM_SWAPCHAIN, *PVBOXWDDM_SWAPCHAIN;
-#endif
-
 typedef struct VBOXWDDM_CONTEXT
 {
@@ -277 +248 @@
     UINT  EngineAffinity;
     BOOLEAN fRenderFromShadowDisabled;
-#ifdef VBOX_WITH_CROGL
-    int32_t hostID;
-    uint32_t u32CrConClientID;
-    VBOXMP_CRPACKER CrPacker;
-    VBOXWDDM_HTABLE Swapchains;
-#endif
     VBOXVIDEOCM_CTX CmContext;
     VBOXVIDEOCM_ALLOC_CONTEXT AllocContext;
@@ -329 +294 @@
     uint32_t bDoNotSignalCompletion;
 } VBOXWDDM_UHGSMI_BUFFER_SUBMIT_INFO, *PVBOXWDDM_UHGSMI_BUFFER_SUBMIT_INFO;
-
-typedef struct VBOXWDDM_DMA_PRIVATEDATA_CHROMIUM_CMD
-{
-    VBOXWDDM_DMA_PRIVATEDATA_BASEHDR Base;
-    VBOXWDDM_UHGSMI_BUFFER_SUBMIT_INFO aBufInfos[1];
-} VBOXWDDM_DMA_PRIVATEDATA_CHROMIUM_CMD, *PVBOXWDDM_DMA_PRIVATEDATA_CHROMIUM_CMD;
 
 typedef struct VBOXWDDM_DMA_PRIVATEDATA_ALLOCINFO_ON_SUBMIT

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

@@ -763 +763 @@
 
     pDevExt->u.primary.DxgkInterface.DxgkCbNotifyInterrupt(pDevExt->u.primary.DxgkInterface.DeviceHandle, &notify);
-}
-
-typedef struct VBOXCMDVBVA_NOTIFYPREEMPT_CB
-{
-    PVBOXMP_DEVEXT pDevExt;
-    VBOXCMDVBVA *pVbva;
-    int rc;
-    UINT u32SubmitFenceId;
-    UINT u32PreemptFenceId;
-} VBOXCMDVBVA_NOTIFYPREEMPT_CB;
-
-static BOOLEAN vboxCmdVbvaDdiNotifyPreemptCb(PVOID pvContext)
-{
-    VBOXCMDVBVA_NOTIFYPREEMPT_CB* pData = (VBOXCMDVBVA_NOTIFYPREEMPT_CB*)pvContext;
-    PVBOXMP_DEVEXT pDevExt = pData->pDevExt;
-    VBOXCMDVBVA *pVbva = pData->pVbva;
-    Assert(pVbva->u32FenceProcessed >= pVbva->u32FenceCompleted);
-    if (!pData->u32SubmitFenceId || pVbva->u32FenceProcessed == pData->u32SubmitFenceId)
-    {
-        vboxCmdVbvaDdiNotifyCompleteIrq(pDevExt, pVbva, pData->u32PreemptFenceId, DXGK_INTERRUPT_DMA_PREEMPTED);
-
-        pDevExt->u.primary.DxgkInterface.DxgkCbQueueDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
-    }
-    else
-    {
-        Assert(pVbva->u32FenceProcessed < pData->u32SubmitFenceId);
-        Assert(pVbva->cPreempt <= VBOXCMDVBVA_PREEMPT_EL_SIZE);
-        if (pVbva->cPreempt == VBOXCMDVBVA_PREEMPT_EL_SIZE)
-        {
-            WARN(("no more free elements in preempt map"));
-            pData->rc = VERR_BUFFER_OVERFLOW;
-            return FALSE;
-        }
-        uint32_t iNewEl = (pVbva->iCurPreempt + pVbva->cPreempt) % VBOXCMDVBVA_PREEMPT_EL_SIZE;
-        Assert(iNewEl < VBOXCMDVBVA_PREEMPT_EL_SIZE);
-        pVbva->aPreempt[iNewEl].u32SubmitFence = pData->u32SubmitFenceId;
-        pVbva->aPreempt[iNewEl].u32PreemptFence = pData->u32PreemptFenceId;
-        ++pVbva->cPreempt;
-    }
-
-    pData->rc = VINF_SUCCESS;
-    return TRUE;
-}
-
-static int vboxCmdVbvaDdiNotifyPreempt(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, UINT u32SubmitFenceId, UINT u32PreemptFenceId)
-{
-    VBOXCMDVBVA_NOTIFYPREEMPT_CB Data;
-    Data.pDevExt = pDevExt;
-    Data.pVbva = pVbva;
-    Data.rc = VERR_INTERNAL_ERROR;
-    Data.u32SubmitFenceId = u32SubmitFenceId;
-    Data.u32PreemptFenceId = u32PreemptFenceId;
-    BOOLEAN bDummy;
-    NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbSynchronizeExecution(
-            pDevExt->u.primary.DxgkInterface.DeviceHandle,
-            vboxCmdVbvaDdiNotifyPreemptCb,
-            &Data,
-            0, /* IN ULONG MessageNumber */
-            &bDummy);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("DxgkCbSynchronizeExecution failed Status %#x", Status));
-        return VERR_GENERAL_FAILURE;
-    }
-
-    if (!RT_SUCCESS(Data.rc))
-    {
-        WARN(("vboxCmdVbvaDdiNotifyPreemptCb failed rc %d", Data.rc));
-        return Data.rc;
-    }
-
-    return VINF_SUCCESS;
 }
 
@@ -1058 +986 @@
 }
 
-bool VBoxCmdVbvaPreempt(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, uint32_t u32FenceID)
-{
-    VBVAEXBUFFERBACKWARDITER Iter;
-    VBoxVBVAExBIterInit(&pVbva->Vbva, &Iter);
-
-    uint32_t cbBuffer;
-    bool fProcessed;
-    uint8_t* pu8Cmd;
-    uint32_t u32SubmitFence = 0;
-
-    /* we can do it right here */
-    while ((pu8Cmd = (uint8_t*)VBoxVBVAExBIterNext(&Iter, &cbBuffer, &fProcessed)) != NULL)
-    {
-        if (*pu8Cmd == VBOXCMDVBVA_OPTYPE_NOP)
-            continue;
-
-        VBOXCMDVBVA_HDR *pCmd = (VBOXCMDVBVA_HDR*)pu8Cmd;
-
-        if (ASMAtomicCmpXchgU8(&pCmd->u8State, VBOXCMDVBVA_STATE_CANCELLED, VBOXCMDVBVA_STATE_SUBMITTED)
-                || pCmd->u8State == VBOXCMDVBVA_STATE_CANCELLED)
-            continue;
-
-        Assert(pCmd->u8State == VBOXCMDVBVA_STATE_IN_PROGRESS);
-
-        u32SubmitFence = pCmd->u2.u32FenceID;
-        break;
-    }
-
-    vboxCmdVbvaDdiNotifyPreempt(pDevExt, pVbva, u32SubmitFence, u32FenceID);
-
-    return false;
-}
-
 bool VBoxCmdVbvaCheckCompletedIrq(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva)
 {
@@ -1164 +1059 @@
 }
 
-uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, uint32_t *pu32FenceSubmitted, uint32_t *pu32FenceProcessed)
-{
-    return vboxCmdVbvaCheckCompleted(pDevExt, pVbva, fPingHost, &VBoxCommonFromDeviceExt(pDevExt)->guestCtx, false /* fBufferOverflow */, pu32FenceSubmitted, pu32FenceProcessed);
-}
-
 #if 0
 static uint32_t vboxCVDdiSysMemElBuild(VBOXCMDVBVA_SYSMEMEL *pEl, PMDL pMdl, uint32_t iPfn, uint32_t cPages)

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

@@ -212 +212 @@
 void VBoxCmdVbvaSubmitUnlock(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, VBOXCMDVBVA_HDR* pCmd, uint32_t u32FenceID);
 VBOXCMDVBVA_HDR* VBoxCmdVbvaSubmitLock(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, uint32_t cbCmd);
-bool VBoxCmdVbvaPreempt(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, uint32_t u32FenceID);
-uint32_t VBoxCmdVbvaCheckCompleted(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva, bool fPingHost, uint32_t *pu32FenceSubmitted, uint32_t *pu32FenceProcessed);
 bool VBoxCmdVbvaCheckCompletedIrq(PVBOXMP_DEVEXT pDevExt, VBOXCMDVBVA *pVbva);
 

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

@@ -21 +21 @@
 #include "VBoxMPVhwa.h"
 #include <iprt/asm.h>
-#include "VBoxMPCr.h"
 #include <iprt/mem.h>
-
-#ifdef VBOX_WITH_CROGL
-# include <packer.h>
-#endif
 
 static NTSTATUS vboxVdmaCrCtlGetDefaultClientId(PVBOXMP_DEVEXT pDevExt, uint32_t *pu32ClienID);
@@ -266 +261 @@
     return true;
 }
-#ifdef VBOX_WITH_CROGL
-NTSTATUS vboxVdmaPostHideSwapchain(PVBOXWDDM_SWAPCHAIN pSwapchain)
-{
-    Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
-    uint32_t cbCmdInternal = VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE4CRECTS(0);
-    PVBOXVIDEOCM_CMD_RECTS_INTERNAL pCmdInternal =
-            (PVBOXVIDEOCM_CMD_RECTS_INTERNAL)vboxVideoCmCmdCreate(&pSwapchain->pContext->CmContext, cbCmdInternal);
-    Assert(pCmdInternal);
-    if (pCmdInternal)
-    {
-        pCmdInternal->hSwapchainUm = pSwapchain->hSwapchainUm;
-        pCmdInternal->Cmd.fFlags.Value = 0;
-        pCmdInternal->Cmd.fFlags.bAddHiddenRects = 1;
-        pCmdInternal->Cmd.fFlags.bHide = 1;
-        pCmdInternal->Cmd.RectsInfo.cRects = 0;
-        vboxVideoCmCmdSubmit(pCmdInternal, VBOXVIDEOCM_SUBMITSIZE_DEFAULT);
-        return STATUS_SUCCESS;
-    }
-    return STATUS_NO_MEMORY;
-}
-#endif
+
 static VOID vboxWddmBltPipeRectsTranslate(VBOXVDMAPIPE_RECTS *pRects, int x, int y)
 {
@@ -309 +284 @@
     return pDup;
 }
-#ifdef VBOX_WITH_CROGL
-typedef struct VBOXMP_VDMACR_WRITECOMPLETION
-{
-    void *pvBufferToFree;
-} VBOXMP_VDMACR_WRITECOMPLETION, *PVBOXMP_VDMACR_WRITECOMPLETION;
-
-static DECLCALLBACK(void) vboxVdmaCrWriteCompletion(PVBOXMP_CRSHGSMITRANSPORT pCon, int rc, void RT_UNTRUSTED_VOLATILE_HOST *pvCtx)
-{
-    RT_NOREF(rc);
-    PVBOXMP_VDMACR_WRITECOMPLETION pData = (PVBOXMP_VDMACR_WRITECOMPLETION)pvCtx;
-    void *pvBufferToFree = pData->pvBufferToFree;
-    if (pvBufferToFree)
-        VBoxMpCrShgsmiTransportBufFree(pCon, pvBufferToFree);
-
-    VBoxMpCrShgsmiTransportCmdTermWriteAsync(pCon, pvCtx);
-}
-
-typedef struct VBOXMP_VDMACR_WRITEREADCOMPLETION
-{
-    void RT_UNTRUSTED_VOLATILE_HOST *pvBufferToFree;
-    void RT_UNTRUSTED_VOLATILE_HOST *pvContext;
-} VBOXMP_VDMACR_WRITEREADCOMPLETION, *PVBOXMP_VDMACR_WRITEREADCOMPLETION;
-
-void vboxVdmaCrSubmitWriteReadAsyncGenericCompletion(PVBOXMP_CRSHGSMITRANSPORT pCon, void RT_UNTRUSTED_VOLATILE_HOST *pvCtx)
-{
-    VBOXMP_VDMACR_WRITEREADCOMPLETION RT_UNTRUSTED_VOLATILE_HOST *pData
-        = (VBOXMP_VDMACR_WRITEREADCOMPLETION RT_UNTRUSTED_VOLATILE_HOST *)pvCtx;
-    void RT_UNTRUSTED_VOLATILE_HOST *pvBufferToFree = pData->pvBufferToFree;
-    if (pvBufferToFree)
-        VBoxMpCrShgsmiTransportBufFree(pCon, pvBufferToFree);
-
-    VBoxMpCrShgsmiTransportCmdTermWriteReadAsync(pCon, pvCtx);
-}
-
-static NTSTATUS vboxVdmaCrSubmitWriteReadAsync(PVBOXMP_DEVEXT pDevExt, VBOXMP_CRPACKER *pCrPacker, uint32_t u32CrConClientID,
-                                               PFNVBOXMP_CRSHGSMITRANSPORT_SENDWRITEREADASYNC_COMPLETION pfnCompletion,
-                                               void RT_UNTRUSTED_VOLATILE_HOST *pvCompletion)
-{
-    Assert(u32CrConClientID);
-    NTSTATUS Status = STATUS_SUCCESS;
-    uint32_t cbBuffer;
-    void * pvPackBuffer;
-    void * pvBuffer = VBoxMpCrPackerTxBufferComplete(pCrPacker, &cbBuffer, &pvPackBuffer);
-    if (pvBuffer)
-    {
-        VBOXMP_VDMACR_WRITEREADCOMPLETION RT_UNTRUSTED_VOLATILE_HOST *pCompletionData
-            = (VBOXMP_VDMACR_WRITEREADCOMPLETION RT_UNTRUSTED_VOLATILE_HOST  *)
-              VBoxMpCrShgsmiTransportCmdCreateWriteReadAsync(&pDevExt->CrHgsmiTransport, u32CrConClientID, pvBuffer, cbBuffer,
-                                                             pfnCompletion, sizeof(*pCompletionData));
-        if (pCompletionData)
-        {
-            pCompletionData->pvBufferToFree = pvPackBuffer;
-            pCompletionData->pvContext = pvCompletion;
-            int rc = VBoxMpCrShgsmiTransportCmdSubmitWriteReadAsync(&pDevExt->CrHgsmiTransport, pCompletionData);
-            if (RT_SUCCESS(rc))
-            {
-                return STATUS_SUCCESS;
-            }
-            WARN(("VBoxMpCrShgsmiTransportCmdSubmitWriteReadAsync failed, rc %d", rc));
-            Status = STATUS_UNSUCCESSFUL;
-            VBoxMpCrShgsmiTransportCmdTermWriteReadAsync(&pDevExt->CrHgsmiTransport, pCompletionData);
-        }
-        else
-        {
-            WARN(("VBoxMpCrShgsmiTransportCmdCreateWriteReadAsync failed"));
-            Status = STATUS_INSUFFICIENT_RESOURCES;
-        }
-    }
-
-    return Status;
-}
-
-NTSTATUS vboxVdmaCrSubmitWriteAsync(PVBOXMP_DEVEXT pDevExt, VBOXMP_CRPACKER *pCrPacker, uint32_t u32CrConClientID)
-{
-    Assert(u32CrConClientID);
-    NTSTATUS Status = STATUS_SUCCESS;
-    uint32_t cbBuffer;
-    void * pvPackBuffer;
-    void * pvBuffer = VBoxMpCrPackerTxBufferComplete(pCrPacker, &cbBuffer, &pvPackBuffer);
-    if (pvBuffer)
-    {
-        VBOXMP_VDMACR_WRITECOMPLETION RT_UNTRUSTED_VOLATILE_HOST *pCompletionData
-            = (VBOXMP_VDMACR_WRITECOMPLETION RT_UNTRUSTED_VOLATILE_HOST *)
-              VBoxMpCrShgsmiTransportCmdCreateWriteAsync(&pDevExt->CrHgsmiTransport, u32CrConClientID, pvBuffer, cbBuffer,
-                                                         vboxVdmaCrWriteCompletion, sizeof(*pCompletionData));
-        if (pCompletionData)
-        {
-            pCompletionData->pvBufferToFree = pvPackBuffer;
-            int rc = VBoxMpCrShgsmiTransportCmdSubmitWriteAsync(&pDevExt->CrHgsmiTransport, pCompletionData);
-            if (RT_SUCCESS(rc))
-            {
-                return STATUS_SUCCESS;
-            }
-            WARN(("VBoxMpCrShgsmiTransportCmdSubmitWriteAsync failed, rc %d", rc));
-            Status = STATUS_UNSUCCESSFUL;
-            VBoxMpCrShgsmiTransportCmdTermWriteAsync(&pDevExt->CrHgsmiTransport, pCompletionData);
-        }
-        else
-        {
-            WARN(("VBoxMpCrShgsmiTransportCmdCreateWriteAsync failed"));
-            Status = STATUS_INSUFFICIENT_RESOURCES;
-        }
-    }
-
-    return Status;
-}
-
-static NTSTATUS vboxVdmaVRegGet(PVBOXWDDM_SWAPCHAIN pSwapchain, const RTRECT *pCtxRect, uint32_t *pcVRects, RTRECT **ppVRectsBuff, uint32_t *pcVRectsBuff)
-{
-    RTRECT *pVRectsBuff = *ppVRectsBuff;
-    uint32_t cVRectsBuff = *pcVRectsBuff;
-    uint32_t cVRects = VBoxVrListRectsCount(&pSwapchain->VisibleRegions);
-    if (cVRectsBuff < cVRects)
-    {
-        if (pVRectsBuff)
-            vboxWddmMemFree(pVRectsBuff);
-        pVRectsBuff = (RTRECT*)vboxWddmMemAlloc(cVRects * sizeof (pVRectsBuff[0]));
-        if (!pVRectsBuff)
-        {
-            WARN(("vboxWddmMemAlloc failed"));
-            *pcVRectsBuff = 0;
-            *ppVRectsBuff = NULL;
-            *pcVRects = NULL;
-            return STATUS_NO_MEMORY;
-        }
-
-        cVRectsBuff = cVRects;
-        *pcVRectsBuff = cVRectsBuff;
-        *ppVRectsBuff = pVRectsBuff;
-    }
-
-    int rc = VBoxVrListRectsGet(&pSwapchain->VisibleRegions, cVRects, pVRectsBuff);
-    AssertRC(rc);
-    if (pCtxRect->xLeft || pCtxRect->yTop)
-    {
-        for (UINT i = 0; i < cVRects; ++i)
-        {
-            VBoxRectTranslate(&pVRectsBuff[i], -pCtxRect->xLeft, -pCtxRect->yTop);
-        }
-    }
-
-    *pcVRects = cVRects;
-    return STATUS_SUCCESS;
-}
-
-
-/**
- * @param pDevExt
- */
-static NTSTATUS vboxVdmaProcessVRegCmdLegacy(PVBOXMP_DEVEXT pDevExt,
-        VBOXMP_CRPACKER *pCrPacker,
-        uint32_t u32CrConClientID,
-        PVBOXWDDM_SOURCE pSource,
-        PVBOXWDDM_SWAPCHAIN pSwapchain,
-        const RECT *pSrcRect,
-        const VBOXVDMAPIPE_RECTS *pContextRects)
-{
-    VBOXVDMAPIPE_RECTS *pRectsToFree = NULL;
-    POINT pos = pSource->VScreenPos;
-    if (pos.x || pos.y)
-    {
-        pRectsToFree = vboxWddmBltPipeRectsDup(pContextRects);
-        /* note: do NOT translate the src rect since it is used for screen pos calculation */
-        vboxWddmBltPipeRectsTranslate(pRectsToFree, pos.x, pos.y);
-        pContextRects = pRectsToFree;
-    }
-    const VBOXWDDM_RECTS_INFO *pRects = &pContextRects->UpdateRects;
-    NTSTATUS Status = STATUS_SUCCESS;
-    int rc;
-    bool fCurChanged = FALSE;
-    bool fCurRectChanged = FALSE;
-    POINT CurPos = { 0, 0 }; /* MSC is confused (me too), maybe used uninitialized. */
-    RTRECT *pVRectsBuff = NULL;
-    uint32_t cVRectsBuff = 0;
-    VBOXWDDM_CTXLOCK_DATA
-
-    VBOXWDDM_CTXLOCK_LOCK(pDevExt);
-
-    if (pSwapchain)
-    {
-        CurPos.x = pContextRects->ContextRect.left - pSrcRect->left;
-        CurPos.y = pContextRects->ContextRect.top - pSrcRect->top;
-
-        if (CurPos.x != pSwapchain->Pos.x || CurPos.y != pSwapchain->Pos.y)
-        {
-#if 0
-            if (pSwapchain->Pos.x != VBOXWDDM_INVALID_COORD)
-                VBoxVrListTranslate(&pSwapchain->VisibleRegions, pSwapchain->Pos.x - CurPos.x, pSwapchain->Pos.y - CurPos.y);
-            else
-#endif
-                VBoxVrListClear(&pSwapchain->VisibleRegions);
-            fCurRectChanged = TRUE;
-            pSwapchain->Pos = CurPos;
-        }
-
-        rc = VBoxVrListRectsAdd(&pSwapchain->VisibleRegions, pRects->cRects, (const RTRECT*)pRects->aRects, &fCurChanged);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("VBoxWddmVrListRectsAdd failed, rc %d!", rc));
-            Status = STATUS_UNSUCCESSFUL;
-            goto done;
-        }
-
-
-        /* visible rects of different windows do not intersect,
-         * so if the given window visible rects did not increase, others have not changed either */
-        if (!fCurChanged && !fCurRectChanged)
-            goto done;
-    }
-
-    /* before posting the add visible rects diff, we need to first hide rects for other windows */
-
-    for (PLIST_ENTRY pCur = pDevExt->SwapchainList3D.Flink; pCur != &pDevExt->SwapchainList3D; pCur = pCur->Flink)
-    {
-        if (pCur != &pSwapchain->DevExtListEntry)
-        {
-            PVBOXWDDM_SWAPCHAIN pCurSwapchain = VBOXWDDMENTRY_2_SWAPCHAIN(pCur);
-            PVBOXWDDM_CONTEXT pCurContext = pCurSwapchain->pContext;
-            PVBOXMP_CRPACKER pCurPacker = &pCurContext->CrPacker;
-            bool fChanged = FALSE;
-
-            rc = VBoxVrListRectsSubst(&pCurSwapchain->VisibleRegions, pRects->cRects, (const RTRECT*)pRects->aRects, &fChanged);
-            if (!RT_SUCCESS(rc))
-            {
-                WARN(("VBoxWddmVrListRectsAdd failed, rc %d!", rc));
-                Status = STATUS_UNSUCCESSFUL;
-                goto done;
-            }
-
-            if (!fChanged)
-                continue;
-
-            uint32_t cVRects;
-            RTRECT CurCtxRect;
-            CurCtxRect.xLeft = pCurSwapchain->Pos.x;
-            CurCtxRect.yTop = pCurSwapchain->Pos.y;
-            CurCtxRect.xRight = CurCtxRect.xLeft + pCurSwapchain->width;
-            CurCtxRect.yBottom = CurCtxRect.yTop + pCurSwapchain->height;
-            Status = vboxVdmaVRegGet(pCurSwapchain, &CurCtxRect, &cVRects, &pVRectsBuff, &cVRectsBuff);
-            if (!NT_SUCCESS(Status))
-            {
-                WARN(("vboxVdmaVRegGet Status 0x%x", Status));
-                goto done;
-            }
-
-            ;
-            uint32_t cbCommandBuffer = VBOXMP_CRCMD_HEADER_SIZE
-                                     + VBOXMP_CRCMD_SIZE_WINDOWVISIBLEREGIONS(cVRects);
-            void RT_UNTRUSTED_VOLATILE_HOST *pvCommandBuffer = VBoxMpCrShgsmiTransportBufAlloc(&pDevExt->CrHgsmiTransport,
-                                                                                               cbCommandBuffer);
-            if (!pvCommandBuffer)
-            {
-                WARN(("VBoxMpCrShgsmiTransportBufAlloc failed!"));
-                Status = VERR_OUT_OF_RESOURCES;
-                goto done;
-            }
-
-            VBoxMpCrPackerTxBufferInit(pCurPacker, pvCommandBuffer, cbCommandBuffer, 1);
-
-            Assert(pCurSwapchain->winHostID);
-            crPackWindowVisibleRegion(&pCurPacker->CrPacker, pCurSwapchain->winHostID, cVRects, (GLint*)pVRectsBuff);
-
-            Status = vboxVdmaCrSubmitWriteAsync(pDevExt, pCurPacker, pCurContext->u32CrConClientID);
-            if (!NT_SUCCESS(Status))
-            {
-                WARN(("vboxVdmaCrSubmitWriteAsync failed Status 0x%x", Status));
-                VBoxMpCrShgsmiTransportBufFree(&pDevExt->CrHgsmiTransport, pvCommandBuffer);
-            }
-        }
-    }
-
-    if (!pSwapchain)
-        goto done;
-
-    uint32_t cbCommandBuffer = VBOXMP_CRCMD_HEADER_SIZE, cCommands = 0;
-
-    uint32_t cVRects;
-    Status = vboxVdmaVRegGet(pSwapchain, (const RTRECT *)&pContextRects->ContextRect, &cVRects, &pVRectsBuff, &cVRectsBuff);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaVRegGet Status 0x%x", Status));
-        goto done;
-    }
-
-    ++cCommands;
-    cbCommandBuffer += VBOXMP_CRCMD_SIZE_WINDOWVISIBLEREGIONS(cVRects);
-
-    if (fCurRectChanged && fCurChanged)
-    {
-        ++cCommands;
-        cbCommandBuffer += VBOXMP_CRCMD_SIZE_WINDOWPOSITION;
-    }
-
-    if (!pSwapchain->fExposed)
-    {
-        ++cCommands;
-        cbCommandBuffer += VBOXMP_CRCMD_SIZE_WINDOWSHOW;
-        ++cCommands;
-        cbCommandBuffer += VBOXMP_CRCMD_SIZE_WINDOWSIZE;
-    }
-
-    void RT_UNTRUSTED_VOLATILE_HOST *pvCommandBuffer = VBoxMpCrShgsmiTransportBufAlloc(&pDevExt->CrHgsmiTransport, cbCommandBuffer);
-    if (!pvCommandBuffer)
-    {
-        WARN(("VBoxMpCrShgsmiTransportBufAlloc failed!"));
-        Status = STATUS_INSUFFICIENT_RESOURCES;
-        goto done;
-    }
-
-    VBoxMpCrPackerTxBufferInit(pCrPacker, pvCommandBuffer, cbCommandBuffer, cCommands);
-
-    Assert(pSwapchain->winHostID);
-
-    if (fCurRectChanged && fCurChanged)
-        crPackWindowPosition(&pCrPacker->CrPacker, pSwapchain->winHostID, CurPos.x, CurPos.y);
-
-    if (!pSwapchain->fExposed)
-    {
-        crPackWindowSize(&pCrPacker->CrPacker, pSwapchain->winHostID, pSwapchain->width, pSwapchain->height);
-        crPackWindowShow(&pCrPacker->CrPacker, pSwapchain->winHostID, TRUE);
-        pSwapchain->fExposed = TRUE;
-    }
-
-    crPackWindowVisibleRegion(&pCrPacker->CrPacker, pSwapchain->winHostID, cVRects, (GLint*)pVRectsBuff);
-
-    Status = vboxVdmaCrSubmitWriteAsync(pDevExt, pCrPacker, u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrSubmitWriteAsync failed Status 0x%x", Status));
-        VBoxMpCrShgsmiTransportBufFree(&pDevExt->CrHgsmiTransport, pvCommandBuffer);
-    }
-
-done:
-    VBOXWDDM_CTXLOCK_UNLOCK(pDevExt);
-
-    if (pRectsToFree)
-        vboxWddmMemFree(pRectsToFree);
-
-    if (pVRectsBuff)
-        vboxWddmMemFree(pVRectsBuff);
-
-    return Status;
-}
-#endif
 
 static NTSTATUS vboxVdmaGgDmaColorFill(PVBOXMP_DEVEXT pDevExt, VBOXVDMA_CLRFILL *pCF)
@@ -878 +509 @@
 }
 
-#ifdef VBOX_WITH_CROGL
-typedef struct VBOXVDMA_CRRXGENERICSYNC
-{
-    int rc;
-    KEVENT Event;
-} VBOXVDMA_CRRXGENERICSYNC, *PVBOXVDMA_CRRXGENERICSYNC;
-
-/** @callback_method_impl{PFNVBOXMP_CRSHGSMITRANSPORT_SENDWRITEREADASYNC_COMPLETION}   */
-static DECLCALLBACK(void) vboxVdmaCrRxGenericSyncCompletion(PVBOXMP_CRSHGSMITRANSPORT pCon, int rc,
-                                                            void RT_UNTRUSTED_VOLATILE_HOST *pvRx, uint32_t cbRx,
-                                                            void RT_UNTRUSTED_VOLATILE_HOST *pvCtx)
-{
-    VBOXMP_VDMACR_WRITEREADCOMPLETION RT_UNTRUSTED_VOLATILE_HOST *pCompletionData
-        = (VBOXMP_VDMACR_WRITEREADCOMPLETION RT_UNTRUSTED_VOLATILE_HOST *)pvCtx;
-    PVBOXVDMA_CRRXGENERICSYNC pData = (PVBOXVDMA_CRRXGENERICSYNC)pCompletionData->pvContext;
-    if (RT_SUCCESS(rc))
-    {
-        rc = VBoxMpCrCmdRxHandler((CRMessageHeader *)pvRx, cbRx);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("VBoxMpCrCmdRxHandler failed %d", rc));
-        }
-    }
-    else
-    {
-        WARN(("rx failure %d", rc));
-    }
-
-    pData->rc = rc;
-
-    KeSetEvent(&pData->Event, 0, FALSE);
-
-    vboxVdmaCrSubmitWriteReadAsyncGenericCompletion(pCon, pvCtx);
-}
-
-NTSTATUS vboxVdmaCrRxGenericSync(PVBOXMP_DEVEXT pDevExt, VBOXMP_CRPACKER *pCrPacker, uint32_t u32CrConClientID)
-{
-    VBOXVDMA_CRRXGENERICSYNC Data;
-    Data.rc = VERR_NOT_SUPPORTED;
-    KeInitializeEvent(&Data.Event, SynchronizationEvent, FALSE);
-    NTSTATUS Status = vboxVdmaCrSubmitWriteReadAsync(pDevExt, pCrPacker, u32CrConClientID, vboxVdmaCrRxGenericSyncCompletion, &Data);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrSubmitWriteAsync failed Status 0x%x", Status));
-        return Status;
-    }
-
-     Status = KeWaitForSingleObject(&Data.Event, Executive, KernelMode, FALSE, NULL /* PLARGE_INTEGER Timeout */);
-     if (!NT_SUCCESS(Status))
-     {
-         WARN(("KeWaitForSingleObject failed Status 0x%x", Status));
-         return Status;
-     }
-
-     return STATUS_SUCCESS;
-}
-
-typedef struct VBOXMP_CRHGSMIMGR
-{
-    VBOXMP_CRPACKER CrPacker;
-    void RT_UNTRUSTED_VOLATILE_HOST *pvCommandBuffer;
-} VBOXMP_CRHGSMIMGR;
-
-DECLINLINE(CRPackContext*) vboxVdmaCrHmGetPackContext(VBOXMP_CRHGSMIMGR *pMgr)
-{
-    return &pMgr->CrPacker.CrPacker;
-}
-
-NTSTATUS vboxVdmaCrHmCreate(PVBOXMP_DEVEXT pDevExt, VBOXMP_CRHGSMIMGR *pMgr, uint32_t cbCommandBuffer, uint32_t cCommands)
-{
-    pMgr->pvCommandBuffer = VBoxMpCrShgsmiTransportBufAlloc(&pDevExt->CrHgsmiTransport, cbCommandBuffer);
-    if (!pMgr->pvCommandBuffer)
-    {
-        WARN(("VBoxMpCrShgsmiTransportBufAlloc failed!"));
-        return VERR_OUT_OF_RESOURCES;
-    }
-
-    VBoxMpCrPackerInit(&pMgr->CrPacker);
-
-    VBoxMpCrPackerTxBufferInit(&pMgr->CrPacker, pMgr->pvCommandBuffer, cbCommandBuffer, cCommands);
-
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS vboxVdmaCrHmSubmitWrSync(PVBOXMP_DEVEXT pDevExt, VBOXMP_CRHGSMIMGR *pMgr, uint32_t u32CrConClientID)
-{
-    NTSTATUS Status = vboxVdmaCrRxGenericSync(pDevExt, &pMgr->CrPacker, u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrRxGenericSync failed Status 0x%x", Status));
-        VBoxMpCrShgsmiTransportBufFree(&pDevExt->CrHgsmiTransport, pMgr->pvCommandBuffer);
-        return Status;
-    }
-
-    return STATUS_SUCCESS;
-}
-#if 0
-NTSTATUS vboxVdmaCrCmdGetChromiumParametervCR(PVBOXMP_DEVEXT pDevExt, uint32_t u32CrConClientID, GLenum target, GLuint index, GLenum type, GLsizei count, GLvoid * values)
-{
-    uint32_t cbCommandBuffer = VBOXMP_CRCMD_HEADER_SIZE + VBOXMP_CRCMD_SIZE_GETCHROMIUMPARAMETERVCR;
-    uint32_t cCommands = 1;
-
-    VBOXMP_CRHGSMIMGR Mgr;
-    NTSTATUS Status = vboxVdmaCrHmCreate(pDevExt, &Mgr, cbCommandBuffer, cCommands);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrHmCreate failed Status 0x%x", Status));
-        return Status;
-    }
-
-    int dummy = 1;
-
-    crPackGetChromiumParametervCR(vboxVdmaCrHmGetPackContext(&Mgr), target, index, type, count, values, &dummy);
-
-    Status = vboxVdmaCrHmSubmitWrSync(pDevExt, &Mgr, u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrHmSubmitWrSync failed Status 0x%x", Status));
-        return Status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-static NTSTATUS vboxVdmaCrCmdCreateContext(PVBOXMP_DEVEXT pDevExt, int32_t visualBits, int32_t *pi32CtxID)
-{
-    uint32_t cbCommandBuffer = VBOXMP_CRCMD_HEADER_SIZE + VBOXMP_CRCMD_SIZE_CREATECONTEXT;
-    uint32_t cCommands = 1;
-
-    VBOXMP_CRHGSMIMGR Mgr;
-    NTSTATUS Status = vboxVdmaCrHmCreate(pDevExt, &Mgr, cbCommandBuffer, cCommands);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrHmCreate failed Status 0x%x", Status));
-        return Status;
-    }
-
-    int dummy = 1;
-
-    crPackCreateContext(&CrPacker.CrPacker, "", visualBits, 0, &pi32CtxID, &dummy);
-
-    Status = vboxVdmaCrHmSubmitWrSync(pDevExt, &Mgr, u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrHmSubmitWrSync failed Status 0x%x", Status));
-        return Status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-static NTSTATUS vboxVdmaCrCmdWindowCreate(PVBOXMP_DEVEXT pDevExt, int32_t visualBits, int32_t *pi32WinID)
-{
-    uint32_t cbCommandBuffer = VBOXMP_CRCMD_HEADER_SIZE + VBOXMP_CRCMD_SIZE_WINDOWCREATE;
-    uint32_t cCommands = 1;
-
-    VBOXMP_CRHGSMIMGR Mgr;
-    NTSTATUS Status = vboxVdmaCrHmCreate(pDevExt, &Mgr, cbCommandBuffer, cCommands);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrHmCreate failed Status 0x%x", Status));
-        return Status;
-    }
-
-    int dummy = 1;
-
-    crPackWindowCreate(&CrPacker.CrPacker, "", visualBits, 0, &pi32CtxID, &dummy);
-
-    Status = vboxVdmaCrHmSubmitWrSync(pDevExt, &Mgr, u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrHmSubmitWrSync failed Status 0x%x", Status));
-        return Status;
-    }
-
-    return STATUS_SUCCESS;
-}
-
-static NTSTATUS vboxVdmaCrCtlGetDefaultCtxId(PVBOXMP_DEVEXT pDevExt, int32_t *pi32CtxID)
-{
-    if (!pDevExt->i32CrConDefaultCtxID)
-    {
-        if (!pDevExt->f3DEnabled)
-        {
-            WARN(("3D disabled, should not be here!"));
-            return STATUS_UNSUCCESSFUL;
-        }
-
-        uint32_t u32ClienID;
-        NTSTATUS Status = vboxVdmaCrCtlGetDefaultClientId(pDevExt, &u32ClienID);
-        if (!NT_SUCCESS(Status))
-        {
-            WARN(("vboxVdmaCrCtlGetDefaultClientId failed, Status %#x", Status));
-            return Status;
-        }
-
-        Status = vboxVdmaCrCmdWindowCreate(PVBOXMP_DEVEXT pDevExt, int32_t visualBits, int32_t *pi32WinID)
-
-        VBOXMP_CRPACKER CrPacker;
-        VBoxMpCrPackerInit(&CrPacker);
-
-        int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR, &pDevExt->u32CrConDefaultClientID);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("VBoxMpCrCtlConConnect failed, rc %d", rc));
-            return STATUS_UNSUCCESSFUL;
-        }
-    }
-
-    *pi32CtxID = pDevExt->i32CrConDefaultCtxID;
-    return STATUS_SUCCESS;
-}
-#endif
-
-static NTSTATUS vboxVdmaTexPresentSubmit(PVBOXMP_DEVEXT pDevExt,
-        VBOXMP_CRPACKER *pCrPacker,
-        uint32_t u32CrConClientID,
-        uint32_t hostID,
-        uint32_t cfg,
-        int32_t posX,
-        int32_t posY,
-        uint32_t cRects,
-        const RTRECT*paRects)
-{
-    Assert(pDevExt->fTexPresentEnabled);
-
-    uint32_t cbCommandBuffer = VBOXMP_CRCMD_HEADER_SIZE + VBOXMP_CRCMD_SIZE_VBOXTEXPRESENT(cRects);
-    uint32_t cCommands = 1;
-    void RT_UNTRUSTED_VOLATILE_HOST *pvCommandBuffer = VBoxMpCrShgsmiTransportBufAlloc(&pDevExt->CrHgsmiTransport, cbCommandBuffer);
-    if (!pvCommandBuffer)
-    {
-        WARN(("VBoxMpCrShgsmiTransportBufAlloc failed!"));
-        return VERR_OUT_OF_RESOURCES;
-    }
-
-    VBoxMpCrPackerTxBufferInit(pCrPacker, pvCommandBuffer, cbCommandBuffer, cCommands);
-
-    crPackVBoxTexPresent(&pCrPacker->CrPacker, hostID, cfg, posX, posY, cRects, (int32_t*)paRects);
-
-    NTSTATUS Status = vboxVdmaCrSubmitWriteAsync(pDevExt, pCrPacker, u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrSubmitWriteAsync failed Status 0x%x", Status));
-        VBoxMpCrShgsmiTransportBufFree(&pDevExt->CrHgsmiTransport, pvCommandBuffer);
-    }
-
-    return Status;
-}
-
-static NTSTATUS vboxVdmaChromiumParameteriCRSubmit(PVBOXMP_DEVEXT pDevExt,
-        VBOXMP_CRPACKER *pCrPacker,
-        uint32_t u32CrConClientID,
-        uint32_t target, uint32_t value)
-{
-    Assert(pDevExt->fTexPresentEnabled);
-
-    uint32_t cbCommandBuffer = VBOXMP_CRCMD_HEADER_SIZE + VBOXMP_CRCMD_SIZE_CHROMIUMPARAMETERICR;
-    uint32_t cCommands = 1;
-    void RT_UNTRUSTED_VOLATILE_HOST *pvCommandBuffer = VBoxMpCrShgsmiTransportBufAlloc(&pDevExt->CrHgsmiTransport, cbCommandBuffer);
-    if (!pvCommandBuffer)
-    {
-        WARN(("VBoxMpCrShgsmiTransportBufAlloc failed!"));
-        return VERR_OUT_OF_RESOURCES;
-    }
-
-    VBoxMpCrPackerTxBufferInit(pCrPacker, pvCommandBuffer, cbCommandBuffer, cCommands);
-
-    crPackChromiumParameteriCR(&pCrPacker->CrPacker, target, value);
-
-    NTSTATUS Status = vboxVdmaCrSubmitWriteAsync(pDevExt, pCrPacker, u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrSubmitWriteAsync failed Status 0x%x", Status));
-        VBoxMpCrShgsmiTransportBufFree(&pDevExt->CrHgsmiTransport, pvCommandBuffer);
-    }
-
-    return Status;
-}
-
-NTSTATUS VBoxVdmaChromiumParameteriCRSubmit(PVBOXMP_DEVEXT pDevExt, uint32_t target, uint32_t value)
-{
-    uint32_t u32CrConClientID;
-    NTSTATUS Status = vboxVdmaCrCtlGetDefaultClientId(pDevExt, &u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrCtlGetDefaultClientId failed Status 0x%x", Status));
-        return Status;
-    }
-
-    VBOXMP_CRPACKER *pCrPacker = (VBOXMP_CRPACKER *)RTMemTmpAlloc(sizeof(*pCrPacker));
-    if (!pCrPacker)
-        return STATUS_NO_MEMORY;
-    VBoxMpCrPackerInit(pCrPacker);
-
-    Status = vboxVdmaChromiumParameteriCRSubmit(pDevExt, pCrPacker, u32CrConClientID, target, value);
-    if (!NT_SUCCESS(Status))
-        WARN(("vboxVdmaChromiumParameteriCRSubmit failed Status 0x%x", Status));
-
-    RTMemTmpFree(pCrPacker);
-    return Status;
-}
-
-static NTSTATUS vboxVdmaCrCtlGetDefaultClientId(PVBOXMP_DEVEXT pDevExt, uint32_t *pu32ClienID)
-{
-    if (pDevExt->enmHwType != VBOXVIDEO_HWTYPE_VBOX)
-    {
-        /* Should not be called at all in this case. */
-        AssertFailed();
-        return STATUS_UNSUCCESSFUL;
-    }
-
-    if (!pDevExt->u32CrConDefaultClientID)
-    {
-        if (!pDevExt->f3DEnabled)
-        {
-            WARN(("3D disabled, should not be here!"));
-            return STATUS_UNSUCCESSFUL;
-        }
-
-        int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR, &pDevExt->u32CrConDefaultClientID);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("VBoxMpCrCtlConConnect failed, rc %d", rc));
-            return STATUS_UNSUCCESSFUL;
-        }
-    }
-
-    *pu32ClienID = pDevExt->u32CrConDefaultClientID;
-    return STATUS_SUCCESS;
-}
-
-
-static NTSTATUS vboxVdmaProcessVRegTexPresent(PVBOXMP_DEVEXT pDevExt,
-        VBOXMP_CRPACKER *pCrPacker,
-        uint32_t u32CrConClientID,
-        const VBOXWDDM_ALLOC_DATA *pSrcAllocData,
-        const VBOXWDDM_ALLOC_DATA *pDstAllocData,
-        const RECT *pSrcRect, const VBOXVDMAPIPE_RECTS *pDstRects)
-{
-    D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId = pDstAllocData->SurfDesc.VidPnSourceId;
-    if (srcId >= (D3DDDI_VIDEO_PRESENT_SOURCE_ID)VBoxCommonFromDeviceExt(pDevExt)->cDisplays)
-    {
-        WARN(("invalid srcId"));
-        return STATUS_NOT_SUPPORTED;
-    }
-
-    VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[srcId];
-
-    bool fPrimary = vboxWddmAddrVramEqual(&pDstAllocData->Addr, &pSource->AllocData.Addr);
-    /* we care only about screen regions */
-    if (!fPrimary)
-    {
-        WARN(("non-primary allocation passed to vboxWddmSubmitBltCmd!"));
-        return STATUS_NOT_SUPPORTED;
-    }
-
-    NTSTATUS Status = STATUS_SUCCESS;
-    uint32_t hostID = pSrcAllocData->hostID;
-    int rc;
-    if (hostID)
-    {
-//            Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D);
-        int32_t posX = pDstRects->ContextRect.left - pSrcRect->left;
-        int32_t posY = pDstRects->ContextRect.top - pSrcRect->top;
-
-        Status = vboxVdmaTexPresentSubmit(pDevExt, pCrPacker, u32CrConClientID, hostID, srcId, posX, posY, pDstRects->UpdateRects.cRects, (const RTRECT*)pDstRects->UpdateRects.aRects);
-        if (NT_SUCCESS(Status))
-        {
-            rc = VBoxVrListRectsSubst(&pSource->VrList, pDstRects->UpdateRects.cRects, (const RTRECT*)pDstRects->UpdateRects.aRects, NULL);
-            if (RT_SUCCESS(rc))
-                pSource->fHas3DVrs = TRUE;
-            else
-                WARN(("VBoxVrListRectsSubst failed rc %d, ignoring..", rc));
-        }
-        else
-            WARN(("vboxVdmaTexPresentSubmit failed Status 0x%x", Status));
-    }
-    else
-    {
-        Assert(fPrimary);
-
-        bool fChanged = false;
-        Assert(pSource->pPrimaryAllocation->bVisible);
-        rc = VBoxVrListRectsAdd(&pSource->VrList, pDstRects->UpdateRects.cRects, (const RTRECT*)pDstRects->UpdateRects.aRects, &fChanged);
-        if (RT_SUCCESS(rc))
-        {
-            if (fChanged)
-            {
-                Status = vboxVdmaTexPresentSubmit(pDevExt, pCrPacker, u32CrConClientID, hostID, srcId, 0, 0, pDstRects->UpdateRects.cRects, (const RTRECT*)pDstRects->UpdateRects.aRects);
-                if (NT_SUCCESS(Status))
-                {
-                    if (pSource->fHas3DVrs)
-                    {
-                        if (VBoxVrListRectsCount(&pSource->VrList) == 1)
-                        {
-                            RTRECT Rect;
-                            VBoxVrListRectsGet(&pSource->VrList, 1, &Rect);
-                            if (   Rect.xLeft   == 0
-                                && Rect.yTop    == 0
-                                && Rect.xRight  == (int32_t)pDstAllocData->SurfDesc.width
-                                && Rect.yBottom == (int32_t)pDstAllocData->SurfDesc.height)
-                            {
-                                pSource->fHas3DVrs = FALSE;
-                            }
-                        }
-                    }
-                }
-                else
-                    WARN(("vboxVdmaTexPresentSubmit failed Status 0x%x", Status));
-            }
-        }
-        else
-            WARN(("VBoxVrListRectsAdd failed rc %d, ignoring..", rc));
-    }
-
-    return Status;
-}
-
-static NTSTATUS vboxVdmaProcessVReg(PVBOXMP_DEVEXT pDevExt,
-        VBOXMP_CRPACKER *pCrPacker,
-        uint32_t u32CrConClientID,
-        const VBOXWDDM_ALLOCATION *pSrcAlloc,
-        const VBOXWDDM_ALLOCATION *pDstAlloc,
-        const RECT *pSrcRect, const VBOXVDMAPIPE_RECTS *pDstRects)
-{
-    D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId = pDstAlloc->AllocData.SurfDesc.VidPnSourceId;
-    VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[srcId];
-    NTSTATUS Status = STATUS_SUCCESS;
-
-    if (pDevExt->fTexPresentEnabled)
-    {
-        Status = vboxVdmaProcessVRegTexPresent(pDevExt, pCrPacker, u32CrConClientID,
-                &pSrcAlloc->AllocData, &pDstAlloc->AllocData,
-                pSrcRect, pDstRects);
-    }
-    else
-    {
-        PVBOXWDDM_SWAPCHAIN pSwapchain = vboxWddmSwapchainRetainByAlloc(pDevExt, pSrcAlloc);
-
-        if (pSwapchain)
-        {
-            Assert(pSrcAlloc->AllocData.SurfDesc.width == pSwapchain->width);
-            Assert(pSrcAlloc->AllocData.SurfDesc.height == pSwapchain->height);
-        }
-
-        Status = vboxVdmaProcessVRegCmdLegacy(pDevExt, pCrPacker, u32CrConClientID, pSource, pSwapchain, pSrcRect, pDstRects);
-        if (!NT_SUCCESS(Status))
-            WARN(("vboxVdmaProcessVRegCmdLegacy failed Status 0x%x", Status));
-
-        if (pSwapchain)
-            vboxWddmSwapchainRelease(pSwapchain);
-    }
-
-    return Status;
-}
-
-NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData)
-{
-    if (pDevExt->enmHwType != VBOXVIDEO_HWTYPE_VBOX)
-    {
-        /* Not used in this case. */
-        return STATUS_SUCCESS;
-    }
-
-    uint32_t u32CrConClientID;
-    NTSTATUS Status = vboxVdmaCrCtlGetDefaultClientId(pDevExt, &u32CrConClientID);
-    if (!NT_SUCCESS(Status))
-    {
-        WARN(("vboxVdmaCrCtlGetDefaultClientId failed Status 0x%x", Status));
-        return Status;
-    }
-
-    VBOXMP_CRPACKER *pCrPacker = (VBOXMP_CRPACKER *)RTMemTmpAlloc(sizeof(*pCrPacker));
-    if (!pCrPacker)
-        return STATUS_NO_MEMORY;
-    VBoxMpCrPackerInit(pCrPacker);
-
-    RECT Rect;
-    Rect.left = 0;
-    Rect.top = 0;
-    Rect.right = pAllocData->SurfDesc.width;
-    Rect.bottom = pAllocData->SurfDesc.height;
-
-    if (pDevExt->fCmdVbvaEnabled)
-        Status = vboxVdmaTexPresentSubmit(pDevExt, pCrPacker, u32CrConClientID, pAllocData->hostID, pAllocData->SurfDesc.VidPnSourceId, 0, 0, 1, (RTRECT*)&Rect);
-    else if (pDevExt->fTexPresentEnabled)
-    {
-        VBOXVDMAPIPE_RECTS RectInfo;
-        RectInfo.ContextRect = Rect;
-        RectInfo.UpdateRects.cRects = 1;
-        RectInfo.UpdateRects.aRects[0] = Rect;
-
-        Status = vboxVdmaProcessVRegTexPresent(pDevExt, pCrPacker, u32CrConClientID,
-                pAllocData, pAllocData,
-                &Rect, &RectInfo);
-    }
-    else
-        Status = STATUS_NOT_IMPLEMENTED;
-
-    RTMemTmpFree(pCrPacker);
-    return Status;
-}
-
-static NTSTATUS vboxVdmaProcessVRegCmd(PVBOXMP_DEVEXT pDevExt, VBOXWDDM_CONTEXT *pContext,
-        const VBOXWDDM_DMA_ALLOCINFO *pSrcAllocInfo,
-        const VBOXWDDM_DMA_ALLOCINFO *pDstAllocInfo,
-        const RECT *pSrcRect, const VBOXVDMAPIPE_RECTS *pDstRects)
-{
-    return vboxVdmaProcessVReg(pDevExt, &pContext->CrPacker, pContext->u32CrConClientID,
-            pSrcAllocInfo->pAlloc, pDstAllocInfo->pAlloc,
-            pSrcRect, pDstRects);
-}
 
 static void vboxVdmaBltDirtyRectsUpdate(PVBOXMP_DEVEXT pDevExt, VBOXWDDM_SOURCE *pSource, uint32_t cRects, const RECT *paRects)
@@ -1416 +535 @@
     }
 }
-#endif
-
-NTSTATUS vboxVdmaProcessBltCmd(PVBOXMP_DEVEXT pDevExt, VBOXWDDM_CONTEXT *pContext, VBOXWDDM_DMA_PRIVATEDATA_BLT *pBlt)
-{
-    NTSTATUS Status = STATUS_SUCCESS;
-    PVBOXWDDM_ALLOCATION pDstAlloc = pBlt->Blt.DstAlloc.pAlloc;
-    PVBOXWDDM_ALLOCATION pSrcAlloc = pBlt->Blt.SrcAlloc.pAlloc;
-    BOOLEAN fVRAMUpdated = FALSE;
-#ifdef VBOX_WITH_CROGL
-    if (!pDstAlloc->AllocData.hostID && !pSrcAlloc->AllocData.hostID)
-#endif
-    {
-        /* the allocations contain a real data in VRAM, do blitting */
-        vboxVdmaGgDmaBlt(pDevExt, &pBlt->Blt);
-        fVRAMUpdated = TRUE;
-    }
-
-#ifdef VBOX_WITH_CROGL
-    if (VBOXWDDM_IS_FB_ALLOCATION(pDevExt, pDstAlloc)
-            && pDstAlloc->bVisible)
-    {
-        VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pDstAlloc->AllocData.SurfDesc.VidPnSourceId];
-        Assert(pDstAlloc->AllocData.SurfDesc.VidPnSourceId < VBOX_VIDEO_MAX_SCREENS);
-        Assert(pSource->pPrimaryAllocation == pDstAlloc);
-
-        if (fVRAMUpdated)
-            vboxVdmaBltDirtyRectsUpdate(pDevExt, pSource, pBlt->Blt.DstRects.UpdateRects.cRects, pBlt->Blt.DstRects.UpdateRects.aRects);
-
-        if (pSrcAlloc->AllocData.hostID || (pDevExt->fTexPresentEnabled ? pSource->fHas3DVrs : !!pDevExt->cContexts3D))
-        {
-            Status = vboxVdmaProcessVRegCmd(pDevExt, pContext, &pBlt->Blt.SrcAlloc, &pBlt->Blt.DstAlloc, &pBlt->Blt.SrcRect, &pBlt->Blt.DstRects);
-            if (!NT_SUCCESS(Status))
-                WARN(("vboxVdmaProcessVRegCmd failed Status 0x%x", Status));
-        }
-    }
-#endif
-    return Status;
-}
-
-NTSTATUS vboxVdmaProcessFlipCmd(PVBOXMP_DEVEXT pDevExt, VBOXWDDM_CONTEXT *pContext, VBOXWDDM_DMA_PRIVATEDATA_FLIP *pFlip)
-{
-    NTSTATUS Status = STATUS_SUCCESS;
-    PVBOXWDDM_ALLOCATION pAlloc = pFlip->Flip.Alloc.pAlloc;
-    VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pAlloc->AllocData.SurfDesc.VidPnSourceId];
-    vboxWddmAssignPrimary(pSource, pAlloc, pAlloc->AllocData.SurfDesc.VidPnSourceId);
-#ifdef VBOX_WITH_CROGL
-    if (pAlloc->AllocData.hostID)
-    {
-        RECT SrcRect;
-        VBOXVDMAPIPE_RECTS Rects;
-        SrcRect.left = 0;
-        SrcRect.top = 0;
-        SrcRect.right = pAlloc->AllocData.SurfDesc.width;
-        SrcRect.bottom = pAlloc->AllocData.SurfDesc.height;
-        Rects.ContextRect.left = 0;
-        Rects.ContextRect.top = 0;
-        Rects.ContextRect.right = pAlloc->AllocData.SurfDesc.width;
-        Rects.ContextRect.bottom = pAlloc->AllocData.SurfDesc.height;
-        Rects.UpdateRects.cRects = 1;
-        Rects.UpdateRects.aRects[0] = Rects.ContextRect;
-
-        Status = vboxVdmaProcessVRegCmd(pDevExt, pContext, &pFlip->Flip.Alloc, &pFlip->Flip.Alloc, &SrcRect, &Rects);
-        if (!NT_SUCCESS(Status))
-            WARN(("vboxVdmaProcessVRegCmd failed Status 0x%x", Status));
-    }
-    else
-#endif
-    {
-        WARN(("unexpected flip request"));
-    }
-
-    return Status;
-}
-
-NTSTATUS vboxVdmaProcessClrFillCmd(PVBOXMP_DEVEXT pDevExt, VBOXWDDM_CONTEXT *pContext, VBOXWDDM_DMA_PRIVATEDATA_CLRFILL *pCF)
-{
-    RT_NOREF(pContext);
-    NTSTATUS Status = STATUS_SUCCESS;
-    PVBOXWDDM_ALLOCATION pAlloc = pCF->ClrFill.Alloc.pAlloc;
-#ifdef VBOX_WITH_CROGL
-    if (!pAlloc->AllocData.hostID)
-#endif
-    {
-        Status = vboxVdmaGgDmaColorFill(pDevExt, &pCF->ClrFill);
-        if (!NT_SUCCESS(Status))
-            WARN(("vboxVdmaGgDmaColorFill failed Status 0x%x", Status));
-    }
-#ifdef VBOX_WITH_CROGL
-    else
-        WARN(("unexpected clrfill request"));
-#endif
-
-    return Status;
-}
+
 
 
@@ -2146 +1172 @@
     return Status;
 }
-
-NTSTATUS vboxVdmaDdiCmdFenceComplete(PVBOXMP_DEVEXT pDevExt, uint32_t u32NodeOrdinal, uint32_t u32FenceId, DXGK_INTERRUPT_TYPE enmComplType)
-{
-    if (vboxVdmaDdiCmdCanComplete(pDevExt, u32NodeOrdinal))
-        return vboxVdmaDdiCmdFenceNotifyComplete(pDevExt, u32NodeOrdinal, u32FenceId);
-
-    PVBOXVDMADDI_CMD pCmd = (PVBOXVDMADDI_CMD)vboxWddmMemAlloc(sizeof (VBOXVDMADDI_CMD));
-    Assert(pCmd);
-    if (pCmd)
-    {
-        vboxVdmaDdiCmdInit(pCmd, u32NodeOrdinal, u32FenceId, vboxVdmaDdiCmdCompletionCbFree, NULL);
-        NTSTATUS Status = vboxVdmaDdiCmdCompleted(pDevExt, pCmd, enmComplType);
-        AssertNtStatusSuccess(Status);
-        if (Status == STATUS_SUCCESS)
-            return STATUS_SUCCESS;
-        vboxWddmMemFree(pCmd);
-        return Status;
-    }
-    return STATUS_NO_MEMORY;
-}

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

@@ -95 +95 @@
 }
 
-NTSTATUS vboxVdmaDdiCmdFenceComplete(PVBOXMP_DEVEXT pDevExt, uint32_t u32NodeOrdinal, uint32_t u32FenceId, DXGK_INTERRUPT_TYPE enmComplType);
-
 DECLCALLBACK(VOID) vboxVdmaDdiCmdCompletionCbFree(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext);
 
@@ -314 +312 @@
 #define VBOXVDMAPIPE_CMD_DR_FROM_DDI_CMD(_pCmd) ((PVBOXVDMAPIPE_CMD_DR)(((uint8_t*)(_pCmd)) - RT_UOFFSETOF(VBOXVDMAPIPE_CMD_DR, DdiCmd)))
 
-NTSTATUS vboxVdmaProcessBltCmd(PVBOXMP_DEVEXT pDevExt, struct VBOXWDDM_CONTEXT *pContext, struct VBOXWDDM_DMA_PRIVATEDATA_BLT *pBlt);
-NTSTATUS vboxVdmaProcessFlipCmd(PVBOXMP_DEVEXT pDevExt, struct VBOXWDDM_CONTEXT *pContext, struct VBOXWDDM_DMA_PRIVATEDATA_FLIP *pFlip);
-NTSTATUS vboxVdmaProcessClrFillCmd(PVBOXMP_DEVEXT pDevExt, struct VBOXWDDM_CONTEXT *pContext, struct VBOXWDDM_DMA_PRIVATEDATA_CLRFILL *pCF);
-#ifdef VBOX_WITH_CROGL
-NTSTATUS vboxVdmaTexPresentSetAlloc(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData);
-NTSTATUS VBoxVdmaChromiumParameteriCRSubmit(PVBOXMP_DEVEXT pDevExt, uint32_t target, uint32_t value);
-#endif
-
 #endif /* !GA_INCLUDED_SRC_WINNT_Graphics_Video_mp_wddm_VBoxMPVdma_h */

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

@@ -22 +22 @@
 #include "VBoxMPVidPn.h"
 
+#include <iprt/alloc.h>
 #include <iprt/asm.h>
 #include <iprt/param.h>
@@ -39 +40 @@
 
 #include <stdio.h>
-
-/* Uncomment this in order to enable dumping regions guest wants to display on DxgkDdiPresentNew(). */
-//#define VBOX_WDDM_DUMP_REGIONS_ON_PRESENT
 
 #define VBOXWDDM_DUMMY_DMABUFFER_SIZE (sizeof(VBOXCMDVBVA_HDR) / 2)
@@ -192 +190 @@
 }
 
-static void vboxWddmPopulateDmaAllocInfo(PVBOXWDDM_DMA_ALLOCINFO pInfo, PVBOXWDDM_ALLOCATION pAlloc, DXGK_ALLOCATIONLIST *pDmaAlloc)
-{
-    pInfo->pAlloc = pAlloc;
-    if (pDmaAlloc->SegmentId)
-    {
-        pInfo->offAlloc = (VBOXVIDEOOFFSET)pDmaAlloc->PhysicalAddress.QuadPart;
-        pInfo->segmentIdAlloc = pDmaAlloc->SegmentId;
-    }
-    else
-        pInfo->segmentIdAlloc = 0;
-    pInfo->srcId = pAlloc->AllocData.SurfDesc.VidPnSourceId;
-}
-
-static void vboxWddmPopulateDmaAllocInfoWithOffset(PVBOXWDDM_DMA_ALLOCINFO pInfo, PVBOXWDDM_ALLOCATION pAlloc, DXGK_ALLOCATIONLIST *pDmaAlloc, uint32_t offStart)
-{
-    pInfo->pAlloc = pAlloc;
-    if (pDmaAlloc->SegmentId)
-    {
-        pInfo->offAlloc = (VBOXVIDEOOFFSET)pDmaAlloc->PhysicalAddress.QuadPart + offStart;
-        pInfo->segmentIdAlloc = pDmaAlloc->SegmentId;
-    }
-    else
-        pInfo->segmentIdAlloc = 0;
-    pInfo->srcId = pAlloc->AllocData.SurfDesc.VidPnSourceId;
-}
-
 int vboxWddmGhDisplayPostInfoScreen(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData, const POINT * pVScreenPos, uint16_t fFlags)
 {
@@ -375 +347 @@
 NTSTATUS vboxWddmGhDisplaySetInfoLegacy(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData, const POINT * pVScreenPos, uint8_t u8CurCyncState, bool fPowerOff, bool fDisabled)
 {
+    RT_NOREF(u8CurCyncState);
     NTSTATUS Status = STATUS_SUCCESS;
     bool fValidAlloc = pAllocData->SurfDesc.width > 0 && pAllocData->SurfDesc.height > 0;
@@ -381 +354 @@
     if (fValidAlloc)
     {
-#ifdef VBOX_WITH_CROGL
-        if ((u8CurCyncState & VBOXWDDM_HGSYNC_F_CHANGED_LOCATION_ONLY) == VBOXWDDM_HGSYNC_F_CHANGED_LOCATION_ONLY
-                && pAllocData->hostID)
-        {
-            Status = vboxVdmaTexPresentSetAlloc(pDevExt, pAllocData);
-            if (!NT_SUCCESS(Status))
-                WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
-            return Status;
-        }
-#endif
-
         if (pAllocData->SurfDesc.VidPnSourceId == 0)
             Status = vboxWddmGhDisplaySetMode(pDevExt, pAllocData);
@@ -402 +364 @@
         if (NT_SUCCESS(Status))
         {
-#ifdef VBOX_WITH_CROGL
-            if (fValidAlloc && pDevExt->f3DEnabled)
-            {
-                Status = vboxVdmaTexPresentSetAlloc(pDevExt, pAllocData);
-                if (NT_SUCCESS(Status))
-                    return STATUS_SUCCESS;
-                else
-                    WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
-            }
-#else
             return STATUS_SUCCESS;
-#endif
         }
         else
@@ -426 +377 @@
 NTSTATUS vboxWddmGhDisplaySetInfoNew(PVBOXMP_DEVEXT pDevExt, const VBOXWDDM_ALLOC_DATA *pAllocData, const uint32_t *pTargetMap, const POINT * pVScreenPos, uint8_t u8CurCyncState, bool fPowerOff, bool fDisabled)
 {
+    RT_NOREF(u8CurCyncState);
     NTSTATUS Status = STATUS_SUCCESS;
     bool fValidAlloc = pAllocData->SurfDesc.width > 0 && pAllocData->SurfDesc.height > 0;
@@ -432 +384 @@
     if (fValidAlloc)
     {
-#ifdef VBOX_WITH_CROGL
-        if ((u8CurCyncState & VBOXWDDM_HGSYNC_F_CHANGED_LOCATION_ONLY) == VBOXWDDM_HGSYNC_F_CHANGED_LOCATION_ONLY
-                && pAllocData->hostID)
-        {
-            Status = vboxVdmaTexPresentSetAlloc(pDevExt, pAllocData);
-            if (!NT_SUCCESS(Status))
-                WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
-            return Status;
-        }
-#endif
-
         if (ASMBitTest(pTargetMap, 0))
             Status = vboxWddmGhDisplaySetMode(pDevExt, pAllocData);
@@ -452 +393 @@
         if (NT_SUCCESS(Status))
         {
-#ifdef VBOX_WITH_CROGL
-            if (fValidAlloc && pDevExt->f3DEnabled)
-            {
-                Status = vboxVdmaTexPresentSetAlloc(pDevExt, pAllocData);
-                if (NT_SUCCESS(Status))
-                    return STATUS_SUCCESS;
-                else
-                    WARN(("vboxVdmaTexPresentSetAlloc failed, Status 0x%x", Status));
-            }
-#else
             return STATUS_SUCCESS;
-#endif
         }
         else
@@ -844 +774 @@
     if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
     {
-        pDevExt->f3DEnabled = VBoxMpCrCtlConIs3DSupported();
+        pDevExt->f3DEnabled = FALSE;
     }
     else if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
@@ -993 +923 @@
     ULONG offCmdVbva = cbAvailable - cbCmdVbva;
 
+/// @todo The Gallium 3D driver (which still needs pDevExt->fCmdVbvaEnabled == true) does not (should not) use CmdVbva.
+///       But we still have to create the Vbva structure because code elsewhere in the driver depends on it,
+///       for example vboxWddmVramCpuVisibleSize. CmdVbva will be removed eventually.
     int rc = VBoxCmdVbvaCreate(pDevExt, &pDevExt->CmdVbva, offCmdVbva, cbCmdVbva);
     if (RT_SUCCESS(rc))
     {
-        rc = VBoxCmdVbvaEnable(pDevExt, &pDevExt->CmdVbva);
-        if (RT_SUCCESS(rc))
-        {
+// Do not actually send the request to the host, because the Gallium driver does not need this.
+//        rc = VBoxCmdVbvaEnable(pDevExt, &pDevExt->CmdVbva);
+//        if (RT_SUCCESS(rc))
+//        {
             rc = VBoxMPCmnMapAdapterMemory(VBoxCommonFromDeviceExt(pDevExt), (void**)&pDevExt->pvVisibleVram,
                                            0, vboxWddmVramCpuVisibleSize(pDevExt));
@@ -1006 +940 @@
                 WARN(("VBoxMPCmnMapAdapterMemory failed, rc %d", rc));
 
-            VBoxCmdVbvaDisable(pDevExt, &pDevExt->CmdVbva);
-        }
-        else
-            WARN(("VBoxCmdVbvaEnable failed, rc %d", rc));
+//            VBoxCmdVbvaDisable(pDevExt, &pDevExt->CmdVbva);
+//        }
+//        else
+//            WARN(("VBoxCmdVbvaEnable failed, rc %d", rc));
 
         VBoxCmdVbvaDestroy(pDevExt, &pDevExt->CmdVbva);
@@ -1045 +979 @@
     if (pDevExt->fCmdVbvaEnabled)
     {
-        rc = VBoxCmdVbvaDisable(pDevExt, &pDevExt->CmdVbva);
-        if (RT_SUCCESS(rc))
-        {
-            rc = VBoxCmdVbvaDestroy(pDevExt, &pDevExt->CmdVbva);
-            if (RT_FAILURE(rc))
-                WARN(("VBoxCmdVbvaDestroy failed %d", rc));
-        }
-        else
-            WARN(("VBoxCmdVbvaDestroy failed %d", rc));
+//        rc = VBoxCmdVbvaDisable(pDevExt, &pDevExt->CmdVbva);
+//        if (RT_SUCCESS(rc))
+//        {
+//            rc = VBoxCmdVbvaDestroy(pDevExt, &pDevExt->CmdVbva);
+//            if (RT_FAILURE(rc))
+//                WARN(("VBoxCmdVbvaDestroy failed %d", rc));
+//        }
+//        else
+//            WARN(("VBoxCmdVbvaDestroy failed %d", rc));
 
     }
@@ -1179 +1113 @@
             {
                 /* Figure out the host capabilities. Start with nothing. */
-                pDevExt->fTexPresentEnabled = FALSE;
                 pDevExt->fCmdVbvaEnabled = FALSE;
                 pDevExt->fComplexTopologiesEnabled = TRUE;
@@ -1185 +1118 @@
                 if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                 {
-#ifdef VBOX_WITH_CROGL
+                    pDevExt->f3DEnabled = FALSE;
+                }
+#ifdef VBOX_WITH_MESA3D
+                else if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
+                {
                     if (pDevExt->f3DEnabled)
                     {
-                        pDevExt->fTexPresentEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_TEX_PRESENT);
-                        pDevExt->fCmdVbvaEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_CMDVBVA);
-                    }
-#else
-                    pDevExt->f3DEnabled = FALSE;
-#endif
-                }
-#ifdef VBOX_WITH_MESA3D
-                else if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-                {
-                    if (pDevExt->f3DEnabled)
-                    {
-                        pDevExt->fTexPresentEnabled = TRUE;
+                        /// @todo This enables legacy code which is shared with VMSVGA, for example displays setup.
+                        //  Must be removed eventually.
                         pDevExt->fCmdVbvaEnabled = TRUE;
                         pDevExt->fComplexTopologiesEnabled = FALSE; /** @todo Enable after implementing multimonitor support. */
@@ -1255 +1181 @@
                     VBoxWddmSlInit(pDevExt);
 
-#ifdef VBOX_WITH_CROGL
-                    VBoxMpCrShgsmiTransportCreate(&pDevExt->CrHgsmiTransport, pDevExt);
-#endif
-
                     for (UINT i = 0; i < (UINT)VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
                     {
                         PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[i];
                         KeInitializeSpinLock(&pSource->AllocationLock);
-#ifdef VBOX_WITH_CROGL
-                        VBoxVrListInit(&pSource->VrList);
-#endif
                     }
 
@@ -1435 +1354 @@
 #endif
 
-#ifdef VBOX_WITH_CROGL
-    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX && pDevExt->u32CrConDefaultClientID)
-        VBoxMpCrCtlConDisconnect(pDevExt, &pDevExt->CrCtlCon, pDevExt->u32CrConDefaultClientID);
-
-    VBoxMpCrShgsmiTransportTerm(&pDevExt->CrHgsmiTransport);
-#endif
-
     VBoxWddmSlTerm(pDevExt);
 
@@ -1581 +1493 @@
     PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)MiniportDeviceContext;
     BOOLEAN bOur = FALSE;
-#ifdef VBOX_WITH_MESA3D
-    BOOLEAN bSvga = FALSE;
-    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        bSvga = GaDxgkDdiInterruptRoutine(MiniportDeviceContext, MessageNumber);
-    }
-#endif
     bool bNeedDpc = FALSE;
     if (!VBoxCommonFromDeviceExt(pDevExt)->hostCtx.pfHostFlags) /* If HGSMI is enabled at all. */
     {
         WARN(("ISR called with hgsmi disabled!"));
-#ifdef VBOX_WITH_MESA3D
-        return bSvga;
-#else
         return FALSE;
-#endif
     }
 
@@ -1719 +1620 @@
         pDevExt->u.primary.DxgkInterface.DxgkCbQueueDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
 
-#ifdef VBOX_WITH_MESA3D
-    return bSvga || bOur;
-#else
     return bOur;
-#endif
 }
 #endif
@@ -1960 +1857 @@
 }
 
-#ifdef VBOX_WITH_CROGL
-static VOID DxgkDdiDpcRoutineNew(
-    IN CONST PVOID  MiniportDeviceContext
-    )
-{
-//    LOGF(("ENTER, context(0x%p)", MiniportDeviceContext));
-
-    vboxVDbgBreakFv();
-
-    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)MiniportDeviceContext;
-
-    pDevExt->u.primary.DxgkInterface.DxgkCbNotifyDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
-
-#ifdef VBOX_WITH_MESA3D
-    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        GaDxgkDdiDpcRoutine(MiniportDeviceContext);
-    }
-#endif
-
-    if (ASMAtomicReadU32(&pDevExt->fCompletingCommands))
-    {
-        VBOXWDDM_GETDPCDATA_CONTEXT context = {0};
-        BOOLEAN bRet;
-
-        context.pDevExt = pDevExt;
-
-        /* get DPC data at IRQL */
-        NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbSynchronizeExecution(
-                pDevExt->u.primary.DxgkInterface.DeviceHandle,
-                vboxWddmGetDPCDataCallback,
-                &context,
-                0, /* IN ULONG MessageNumber */
-                &bRet);
-        AssertNtStatusSuccess(Status); NOREF(Status);
-
-    //    if (context.data.bNotifyDpc)
-        pDevExt->u.primary.DxgkInterface.DxgkCbNotifyDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
-
-        if (!vboxVtListIsEmpty(&context.data.CtlList))
-        {
-            int rc = VBoxSHGSMICommandPostprocessCompletion (&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, &context.data.CtlList);
-            AssertRC(rc);
-        }
-#ifdef VBOX_WITH_VIDEOHWACCEL
-        if (!vboxVtListIsEmpty(&context.data.VhwaCmdList))
-        {
-            vboxVhwaCompletionListProcess(pDevExt, &context.data.VhwaCmdList);
-        }
-#endif
-    }
-//    LOGF(("LEAVE, context(0x%p)", MiniportDeviceContext));
-}
-#endif
-
 static VOID DxgkDdiDpcRoutineLegacy(
     IN CONST PVOID  MiniportDeviceContext
@@ -2229 +2071 @@
 
     VbglR0TerminateClient();
-
-#ifdef VBOX_WITH_CROGL
-    VBoxVrTerm();
-#endif
 
     PRTLOGGER pLogger = RTLogRelSetDefaultInstance(NULL);
@@ -2434 +2272 @@
                     if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
                     {
-#ifdef VBOX_WITH_CROGL
-                        pQAI->u.vbox.u32VBox3DCaps = VBoxMpCrGetHostCaps();
-#endif
+                        pQAI->u.vbox.u32VBox3DCaps = 0;
                     }
 #ifdef VBOX_WITH_MESA3D
@@ -2603 +2439 @@
 VOID vboxWddmAllocationCleanup(PVBOXMP_DEVEXT pDevExt, PVBOXWDDM_ALLOCATION pAllocation)
 {
+    RT_NOREF(pDevExt);
     switch (pAllocation->enmType)
     {
@@ -2626 +2463 @@
             break;
     }
-#ifdef VBOX_WITH_CROGL
-    PVBOXWDDM_SWAPCHAIN pSwapchain = vboxWddmSwapchainRetainByAlloc(pDevExt, pAllocation);
-    if (pSwapchain)
-    {
-        vboxWddmSwapchainAllocRemove(pDevExt, pSwapchain, pAllocation);
-        vboxWddmSwapchainRelease(pSwapchain);
-    }
-#endif
 }
 
@@ -2966 +2795 @@
         /* wait for all current allocation-related ops are completed */
         vboxWddmAllocationCleanup(pDevExt, pAlloc);
-        if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX && pAlloc->hSharedHandle && pAlloc->AllocData.hostID)
-            VBoxVdmaChromiumParameteriCRSubmit(pDevExt, GL_PIN_TEXTURE_CLEAR_CR, pAlloc->AllocData.hostID);
         vboxWddmAllocationDestroy(pAlloc);
     }
@@ -3172 +2999 @@
 }
 
-#ifdef VBOX_WITH_CROGL
-static NTSTATUS
-APIENTRY
-DxgkDdiPatchNew(
-    CONST HANDLE  hAdapter,
-    CONST DXGKARG_PATCH*  pPatch)
-{
-    RT_NOREF(hAdapter);
-    /* DxgkDdiPatch should be made pageable. */
-    PAGED_CODE();
-
-#ifdef VBOX_WITH_MESA3D
-    if (((PVBOXMP_DEVEXT)hAdapter)->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        return GaDxgkDdiPatch(hAdapter, pPatch);
-    }
-#endif
-
-    LOGF(("ENTER, context(0x%x)", hAdapter));
-
-    vboxVDbgBreakFv();
-
-    uint8_t * pPrivateBuf = (uint8_t*)((uint8_t*)pPatch->pDmaBufferPrivateData + pPatch->DmaBufferPrivateDataSubmissionStartOffset);
-    UINT cbPatchBuff = pPatch->DmaBufferPrivateDataSubmissionEndOffset - pPatch->DmaBufferPrivateDataSubmissionStartOffset;
-
-    for (UINT i = pPatch->PatchLocationListSubmissionStart; i < pPatch->PatchLocationListSubmissionLength; ++i)
-    {
-        const D3DDDI_PATCHLOCATIONLIST* pPatchList = &pPatch->pPatchLocationList[i];
-        Assert(pPatchList->AllocationIndex < pPatch->AllocationListSize);
-        const DXGK_ALLOCATIONLIST *pAllocationList = &pPatch->pAllocationList[pPatchList->AllocationIndex];
-        if (!pAllocationList->SegmentId)
-        {
-            WARN(("no segment id specified"));
-            continue;
-        }
-
-        if (pPatchList->PatchOffset == ~0UL)
-        {
-            /* this is a dummy patch request, ignore */
-            continue;
-        }
-
-        if (pPatchList->PatchOffset >= cbPatchBuff)
-        {
-            WARN(("pPatchList->PatchOffset(%d) >= cbPatchBuff(%d)", pPatchList->PatchOffset, cbPatchBuff));
-            return STATUS_INVALID_PARAMETER;
-        }
-
-        VBOXCMDVBVAOFFSET *poffVram = (VBOXCMDVBVAOFFSET*)(pPrivateBuf + pPatchList->PatchOffset);
-        Assert(pAllocationList->SegmentId);
-        Assert(!pAllocationList->PhysicalAddress.HighPart);
-        Assert(!(pAllocationList->PhysicalAddress.QuadPart & 0xfffUL)); /* <- just a check to ensure allocation offset does not go here */
-        *poffVram = pAllocationList->PhysicalAddress.LowPart + pPatchList->AllocationOffset;
-    }
-
-    return STATUS_SUCCESS;
-}
-#endif
-
-static NTSTATUS
-APIENTRY
-DxgkDdiPatchLegacy(
-    CONST HANDLE  hAdapter,
-    CONST DXGKARG_PATCH*  pPatch)
-{
-    RT_NOREF(hAdapter);
-    /* DxgkDdiPatch should be made pageable. */
-    PAGED_CODE();
-
-    NTSTATUS Status = STATUS_SUCCESS;
-
-    LOGF(("ENTER, context(0x%x)", hAdapter));
-
-    vboxVDbgBreakFv();
-
-    /* Value == 2 is Present
-     * Value == 4 is RedirectedPresent
-     * we do not expect any other flags to be set here */
-//    Assert(pPatch->Flags.Value == 2 || pPatch->Flags.Value == 4);
-    if (pPatch->DmaBufferPrivateDataSubmissionEndOffset - pPatch->DmaBufferPrivateDataSubmissionStartOffset >= sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR))
-    {
-        Assert(pPatch->DmaBufferPrivateDataSize >= sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR));
-        VBOXWDDM_DMA_PRIVATEDATA_BASEHDR *pPrivateDataBase = (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR*)((uint8_t*)pPatch->pDmaBufferPrivateData + pPatch->DmaBufferPrivateDataSubmissionStartOffset);
-        switch (pPrivateDataBase->enmCmd)
-        {
-            case VBOXVDMACMD_TYPE_DMA_PRESENT_BLT:
-            {
-                PVBOXWDDM_DMA_PRIVATEDATA_BLT pBlt = (PVBOXWDDM_DMA_PRIVATEDATA_BLT)pPrivateDataBase;
-                Assert(pPatch->PatchLocationListSubmissionLength == 2);
-                const D3DDDI_PATCHLOCATIONLIST* pPatchList = &pPatch->pPatchLocationList[pPatch->PatchLocationListSubmissionStart];
-                Assert(pPatchList->AllocationIndex == DXGK_PRESENT_SOURCE_INDEX);
-                Assert(pPatchList->PatchOffset == 0);
-                const DXGK_ALLOCATIONLIST *pSrcAllocationList = &pPatch->pAllocationList[pPatchList->AllocationIndex];
-                Assert(pSrcAllocationList->SegmentId);
-                pBlt->Blt.SrcAlloc.segmentIdAlloc = pSrcAllocationList->SegmentId;
-                pBlt->Blt.SrcAlloc.offAlloc = (VBOXVIDEOOFFSET)pSrcAllocationList->PhysicalAddress.QuadPart;
-
-                pPatchList = &pPatch->pPatchLocationList[pPatch->PatchLocationListSubmissionStart + 1];
-                Assert(pPatchList->AllocationIndex == DXGK_PRESENT_DESTINATION_INDEX);
-                Assert(pPatchList->PatchOffset == 4);
-                const DXGK_ALLOCATIONLIST *pDstAllocationList = &pPatch->pAllocationList[pPatchList->AllocationIndex];
-                Assert(pDstAllocationList->SegmentId);
-                pBlt->Blt.DstAlloc.segmentIdAlloc = pDstAllocationList->SegmentId;
-                pBlt->Blt.DstAlloc.offAlloc = (VBOXVIDEOOFFSET)pDstAllocationList->PhysicalAddress.QuadPart;
-                break;
-            }
-            case VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP:
-            {
-                PVBOXWDDM_DMA_PRIVATEDATA_FLIP pFlip = (PVBOXWDDM_DMA_PRIVATEDATA_FLIP)pPrivateDataBase;
-                Assert(pPatch->PatchLocationListSubmissionLength == 1);
-                const D3DDDI_PATCHLOCATIONLIST* pPatchList = &pPatch->pPatchLocationList[pPatch->PatchLocationListSubmissionStart];
-                Assert(pPatchList->AllocationIndex == DXGK_PRESENT_SOURCE_INDEX);
-                Assert(pPatchList->PatchOffset == 0);
-                const DXGK_ALLOCATIONLIST *pSrcAllocationList = &pPatch->pAllocationList[pPatchList->AllocationIndex];
-                Assert(pSrcAllocationList->SegmentId);
-                pFlip->Flip.Alloc.segmentIdAlloc = pSrcAllocationList->SegmentId;
-                pFlip->Flip.Alloc.offAlloc = (VBOXVIDEOOFFSET)pSrcAllocationList->PhysicalAddress.QuadPart;
-                break;
-            }
-            case VBOXVDMACMD_TYPE_DMA_PRESENT_CLRFILL:
-            {
-                PVBOXWDDM_DMA_PRIVATEDATA_CLRFILL pCF = (PVBOXWDDM_DMA_PRIVATEDATA_CLRFILL)pPrivateDataBase;
-                Assert(pPatch->PatchLocationListSubmissionLength == 1);
-                const D3DDDI_PATCHLOCATIONLIST* pPatchList = &pPatch->pPatchLocationList[pPatch->PatchLocationListSubmissionStart];
-                Assert(pPatchList->AllocationIndex == DXGK_PRESENT_DESTINATION_INDEX);
-                Assert(pPatchList->PatchOffset == 0);
-                const DXGK_ALLOCATIONLIST *pDstAllocationList = &pPatch->pAllocationList[pPatchList->AllocationIndex];
-                Assert(pDstAllocationList->SegmentId);
-                pCF->ClrFill.Alloc.segmentIdAlloc = pDstAllocationList->SegmentId;
-                pCF->ClrFill.Alloc.offAlloc = (VBOXVIDEOOFFSET)pDstAllocationList->PhysicalAddress.QuadPart;
-                break;
-            }
-            case VBOXVDMACMD_TYPE_DMA_NOP:
-                break;
-            case VBOXVDMACMD_TYPE_CHROMIUM_CMD:
-            {
-                uint8_t * pPrivateBuf = (uint8_t*)pPrivateDataBase;
-                for (UINT i = pPatch->PatchLocationListSubmissionStart; i < pPatch->PatchLocationListSubmissionLength; ++i)
-                {
-                    const D3DDDI_PATCHLOCATIONLIST* pPatchList = &pPatch->pPatchLocationList[i];
-                    Assert(pPatchList->AllocationIndex < pPatch->AllocationListSize);
-                    const DXGK_ALLOCATIONLIST *pAllocationList = &pPatch->pAllocationList[pPatchList->AllocationIndex];
-                    Assert(pAllocationList->SegmentId);
-                    if (pAllocationList->SegmentId)
-                    {
-                        DXGK_ALLOCATIONLIST *pAllocation2Patch = (DXGK_ALLOCATIONLIST*)(pPrivateBuf + pPatchList->PatchOffset);
-                        pAllocation2Patch->SegmentId = pAllocationList->SegmentId;
-                        pAllocation2Patch->PhysicalAddress.QuadPart = pAllocationList->PhysicalAddress.QuadPart + pPatchList->AllocationOffset;
-                        Assert(!(pAllocationList->PhysicalAddress.QuadPart & 0xfffUL)); /* <- just a check to ensure allocation offset does not go here */
-                    }
-                }
-                break;
-            }
-            default:
-            {
-                AssertBreakpoint();
-                uint8_t *pBuf = ((uint8_t *)pPatch->pDmaBuffer) + pPatch->DmaBufferSubmissionStartOffset;
-                for (UINT i = pPatch->PatchLocationListSubmissionStart; i < pPatch->PatchLocationListSubmissionLength; ++i)
-                {
-                    const D3DDDI_PATCHLOCATIONLIST* pPatchList = &pPatch->pPatchLocationList[i];
-                    Assert(pPatchList->AllocationIndex < pPatch->AllocationListSize);
-                    const DXGK_ALLOCATIONLIST *pAllocationList = &pPatch->pAllocationList[pPatchList->AllocationIndex];
-                    if (pAllocationList->SegmentId)
-                    {
-                        Assert(pPatchList->PatchOffset < (pPatch->DmaBufferSubmissionEndOffset - pPatch->DmaBufferSubmissionStartOffset));
-                        *((VBOXVIDEOOFFSET*)(pBuf+pPatchList->PatchOffset)) = (VBOXVIDEOOFFSET)pAllocationList->PhysicalAddress.QuadPart;
-                    }
-                    else
-                    {
-                        /* sanity */
-                        if (pPatch->Flags.Value == 2 || pPatch->Flags.Value == 4)
-                            Assert(i == 0);
-                    }
-                }
-                break;
-            }
-        }
-    }
-    else if (pPatch->DmaBufferPrivateDataSubmissionEndOffset == pPatch->DmaBufferPrivateDataSubmissionStartOffset)
-    {
-        /* this is a NOP, just return success */
-//        LOG(("null data size, treating as NOP"));
-        return STATUS_SUCCESS;
-    }
-    else
-    {
-        WARN(("DmaBufferPrivateDataSubmissionEndOffset (%d) - DmaBufferPrivateDataSubmissionStartOffset (%d) < sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR) (%d)",
-                pPatch->DmaBufferPrivateDataSubmissionEndOffset,
-                pPatch->DmaBufferPrivateDataSubmissionStartOffset,
-                sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR)));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    LOGF(("LEAVE, context(0x%x)", hAdapter));
-
-    return Status;
-}
-
 typedef struct VBOXWDDM_CALL_ISR
 {
@@ -3403 +3032 @@
 }
 
-#ifdef VBOX_WITH_CRHGSMI
-DECLCALLBACK(VOID) vboxWddmDmaCompleteChromiumCmd(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext)
-{
-    RT_NOREF(pCmd);
-    PVBOXVDMACBUF_DR pDr = (PVBOXVDMACBUF_DR)pvContext;
-    vboxVdmaCBufDrFree(&pDevExt->u.primary.Vdma, pDr);
-}
-#endif
-
-#ifdef VBOX_WITH_CROGL
-static NTSTATUS
-APIENTRY
-DxgkDdiSubmitCommandNew(
-    CONST HANDLE  hAdapter,
-    CONST DXGKARG_SUBMITCOMMAND*  pSubmitCommand)
-{
-    /* DxgkDdiSubmitCommand runs at dispatch, should not be pageable. */
-
-#ifdef VBOX_WITH_MESA3D
-    if (((PVBOXMP_DEVEXT)hAdapter)->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        return GaDxgkDdiSubmitCommand(hAdapter, pSubmitCommand);
-    }
-#endif
-
-//    LOGF(("ENTER, context(0x%x)", hAdapter));
-
-    vboxVDbgBreakFv();
-
-    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
-#ifdef VBOX_STRICT
-    PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pSubmitCommand->hContext;
-    Assert(pContext);
-    Assert(pContext->pDevice);
-    Assert(pContext->pDevice->pAdapter == pDevExt);
-    Assert(!pSubmitCommand->DmaBufferSegmentId);
-#endif
-
-    uint32_t cbCmd = pSubmitCommand->DmaBufferPrivateDataSubmissionEndOffset - pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset;
-    uint32_t cbDma = pSubmitCommand->DmaBufferSubmissionEndOffset - pSubmitCommand->DmaBufferSubmissionStartOffset;
-    VBOXCMDVBVA_HDR *pHdr;
-    VBOXCMDVBVA_HDR NopCmd;
-    uint32_t cbCurCmd, cbCurDma;
-    if (cbCmd < sizeof (VBOXCMDVBVA_HDR))
-    {
-        if (cbCmd || cbDma)
-        {
-            WARN(("invalid command data"));
-            return STATUS_INVALID_PARAMETER;
-        }
-        Assert(!cbDma);
-        NopCmd.u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
-        NopCmd.u8Flags = 0;
-        NopCmd.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-        NopCmd.u2.complexCmdEl.u16CbCmdHost = sizeof (VBOXCMDVBVA_HDR);
-        NopCmd.u2.complexCmdEl.u16CbCmdGuest = 0;
-        cbCmd = sizeof (VBOXCMDVBVA_HDR);
-        pHdr = &NopCmd;
-        cbCurCmd = sizeof (VBOXCMDVBVA_HDR);
-        cbCurDma = 0;
-    }
-    else
-    {
-        pHdr = (VBOXCMDVBVA_HDR*)(((uint8_t*)pSubmitCommand->pDmaBufferPrivateData) + pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset);
-        cbCurCmd = pHdr->u2.complexCmdEl.u16CbCmdHost;
-        cbCurDma = pHdr->u2.complexCmdEl.u16CbCmdGuest;
-    }
-
-
-    VBOXCMDVBVA_HDR *pDstHdr, *pCurDstCmd;
-    if (cbCmd != cbCurCmd || cbCurDma != cbDma)
-    {
-        if (cbCmd < cbCurCmd || cbDma < cbCurDma)
-        {
-            WARN(("incorrect buffer size"));
-            return STATUS_INVALID_PARAMETER;
-        }
-
-        pDstHdr = VBoxCmdVbvaSubmitLock(pDevExt, &pDevExt->CmdVbva, cbCmd + sizeof (VBOXCMDVBVA_HDR));
-        if (!pDstHdr)
-        {
-            WARN(("VBoxCmdVbvaSubmitLock failed"));
-            return STATUS_UNSUCCESSFUL;
-        }
-
-        pDstHdr->u8OpCode = VBOXCMDVBVA_OPTYPE_COMPLEXCMD;
-        pDstHdr->u8Flags = 0;
-        pDstHdr->u.u8PrimaryID = 0;
-
-        pCurDstCmd = pDstHdr + 1;
-    }
-    else
-    {
-        pDstHdr = VBoxCmdVbvaSubmitLock(pDevExt, &pDevExt->CmdVbva, cbCmd);
-        if (!pDstHdr)
-        {
-            WARN(("VBoxCmdVbvaSubmitLock failed"));
-            return STATUS_UNSUCCESSFUL;
-        }
-        pCurDstCmd = pDstHdr;
-    }
-
-    PHYSICAL_ADDRESS phAddr;
-    phAddr.QuadPart = pSubmitCommand->DmaBufferPhysicalAddress.QuadPart + pSubmitCommand->DmaBufferSubmissionStartOffset;
-    NTSTATUS Status = STATUS_SUCCESS;
-    for (;;)
-    {
-        switch (pHdr->u8OpCode)
-        {
-            case VBOXCMDVBVA_OPTYPE_SYSMEMCMD:
-            {
-                VBOXCMDVBVA_SYSMEMCMD *pSysMem = (VBOXCMDVBVA_SYSMEMCMD*)pHdr;
-                if (pSubmitCommand->DmaBufferPhysicalAddress.QuadPart & PAGE_OFFSET_MASK)
-                {
-                    WARN(("command should be page aligned for now"));
-                    return STATUS_INVALID_PARAMETER;
-                }
-                pSysMem->phCmd = (VBOXCMDVBVAPHADDR)(pSubmitCommand->DmaBufferPhysicalAddress.QuadPart + pSubmitCommand->DmaBufferSubmissionStartOffset);
-#ifdef DEBUG
-                {
-                    uint32_t cbRealDmaCmd = (pSysMem->Hdr.u8Flags | (pSysMem->Hdr.u.u8PrimaryID << 8));
-                    Assert(cbRealDmaCmd >= cbDma);
-                    if (cbDma < cbRealDmaCmd)
-                        WARN(("parrtial sysmem transfer"));
-                }
-#endif
-                break;
-            }
-            default:
-                break;
-        }
-
-        memcpy(pCurDstCmd, pHdr, cbCurCmd);
-        pCurDstCmd->u2.complexCmdEl.u16CbCmdGuest = 0;
-
-        phAddr.QuadPart += cbCurDma;
-        pHdr = (VBOXCMDVBVA_HDR*)(((uint8_t*)pHdr) + cbCurCmd);
-        pCurDstCmd = (VBOXCMDVBVA_HDR*)(((uint8_t*)pCurDstCmd) + cbCurCmd);
-        cbCmd -= cbCurCmd;
-        cbDma -= cbCurDma;
-        if (!cbCmd)
-        {
-            if (cbDma)
-            {
-                WARN(("invalid param"));
-                Status = STATUS_INVALID_PARAMETER;
-            }
-            break;
-        }
-
-        if (cbCmd < sizeof (VBOXCMDVBVA_HDR))
-        {
-            WARN(("invalid param"));
-            Status = STATUS_INVALID_PARAMETER;
-            break;
-        }
-
-        cbCurCmd = pHdr->u2.complexCmdEl.u16CbCmdHost;
-        cbCurDma = pHdr->u2.complexCmdEl.u16CbCmdGuest;
-
-        if (cbCmd < cbCurCmd)
-        {
-            WARN(("invalid param"));
-            Status = STATUS_INVALID_PARAMETER;
-            break;
-        }
-
-        if (cbDma < cbCurDma)
-        {
-            WARN(("invalid param"));
-            Status = STATUS_INVALID_PARAMETER;
-            break;
-        }
-    }
-
-    uint32_t u32FenceId = pSubmitCommand->SubmissionFenceId;
-
-    if (!NT_SUCCESS(Status))
-    {
-        /* nop the entire command on failure */
-        pDstHdr->u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
-        pDstHdr->u8Flags = 0;
-        pDstHdr->u.i8Result = 0;
-        u32FenceId = 0;
-    }
-
-    VBoxCmdVbvaSubmitUnlock(pDevExt, &pDevExt->CmdVbva, pDstHdr, u32FenceId);
-
-    return Status;
-}
-#endif
-
-static NTSTATUS
-APIENTRY
-DxgkDdiSubmitCommandLegacy(
-    CONST HANDLE  hAdapter,
-    CONST DXGKARG_SUBMITCOMMAND*  pSubmitCommand)
-{
-    /* DxgkDdiSubmitCommand runs at dispatch, should not be pageable. */
-    NTSTATUS Status = STATUS_SUCCESS;
-
-//    LOGF(("ENTER, context(0x%x)", hAdapter));
-
-    vboxVDbgBreakFv();
-
-    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
-    PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pSubmitCommand->hContext;
-    PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR pPrivateDataBase = NULL;
-    VBOXVDMACMD_TYPE enmCmd = VBOXVDMACMD_TYPE_UNDEFINED;
-    Assert(pContext);
-    Assert(pContext->pDevice);
-    Assert(pContext->pDevice->pAdapter == pDevExt);
-    Assert(!pSubmitCommand->DmaBufferSegmentId);
-
-    /* the DMA command buffer is located in system RAM, the host will need to pick it from there */
-    //BufInfo.fFlags = 0; /* see VBOXVDMACBUF_FLAG_xx */
-    if (pSubmitCommand->DmaBufferPrivateDataSubmissionEndOffset - pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset >= sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR))
-    {
-        pPrivateDataBase = (PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR)((uint8_t*)pSubmitCommand->pDmaBufferPrivateData + pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset);
-        Assert(pPrivateDataBase);
-        enmCmd = pPrivateDataBase->enmCmd;
-    }
-    else if (pSubmitCommand->DmaBufferPrivateDataSubmissionEndOffset == pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset)
-    {
-        enmCmd = VBOXVDMACMD_TYPE_DMA_NOP;
-    }
-    else
-    {
-        WARN(("DmaBufferPrivateDataSubmissionEndOffset (%d) - DmaBufferPrivateDataSubmissionStartOffset (%d) < sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR) (%d)",
-                pSubmitCommand->DmaBufferPrivateDataSubmissionEndOffset,
-                pSubmitCommand->DmaBufferPrivateDataSubmissionStartOffset,
-                sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR)));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    switch (enmCmd)
-    {
-        case VBOXVDMACMD_TYPE_DMA_PRESENT_BLT:
-        {
-            VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR *pPrivateData = (VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR*)pPrivateDataBase;
-            PVBOXWDDM_DMA_PRIVATEDATA_BLT pBlt = (PVBOXWDDM_DMA_PRIVATEDATA_BLT)pPrivateData;
-            PVBOXWDDM_ALLOCATION pDstAlloc = pBlt->Blt.DstAlloc.pAlloc;
-            PVBOXWDDM_ALLOCATION pSrcAlloc = pBlt->Blt.SrcAlloc.pAlloc;
-            BOOLEAN fSrcChanged;
-            BOOLEAN fDstChanged;
-
-            fDstChanged = vboxWddmAddrSetVram(&pDstAlloc->AllocData.Addr, pBlt->Blt.DstAlloc.segmentIdAlloc, pBlt->Blt.DstAlloc.offAlloc);
-            fSrcChanged = vboxWddmAddrSetVram(&pSrcAlloc->AllocData.Addr, pBlt->Blt.SrcAlloc.segmentIdAlloc, pBlt->Blt.SrcAlloc.offAlloc);
-
-            if (VBOXWDDM_IS_FB_ALLOCATION(pDevExt, pDstAlloc))
-            {
-                Assert(pDstAlloc->AllocData.SurfDesc.VidPnSourceId < VBOX_VIDEO_MAX_SCREENS);
-#if 0
-                VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pDstAlloc->AllocData.SurfDesc.VidPnSourceId];
-                if (VBOXWDDM_IS_FB_ALLOCATION(pDevExt, pDstAlloc) && pDstAlloc->AllocData.hostID)
-                {
-                    if (pSource->AllocData.hostID != pDstAlloc->AllocData.hostID)
-                    {
-                        pSource->AllocData.hostID = pDstAlloc->AllocData.hostID;
-                        fDstChanged = TRUE;
-                    }
-
-                    if (fDstChanged)
-                        pSource->u8SyncState &= ~VBOXWDDM_HGSYNC_F_SYNCED_LOCATION;
-                }
-#endif
-            }
-
-            Status = vboxVdmaProcessBltCmd(pDevExt, pContext, pBlt);
-            if (!NT_SUCCESS(Status))
-                WARN(("vboxVdmaProcessBltCmd failed, Status 0x%x", Status));
-
-            Status = vboxVdmaDdiCmdFenceComplete(pDevExt, pContext->NodeOrdinal, pSubmitCommand->SubmissionFenceId,
-                    NT_SUCCESS(Status) ? DXGK_INTERRUPT_DMA_COMPLETED : DXGK_INTERRUPT_DMA_FAULTED);
-            break;
-        }
-        case VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP:
-        {
-            VBOXWDDM_DMA_PRIVATEDATA_FLIP *pFlip = (VBOXWDDM_DMA_PRIVATEDATA_FLIP*)pPrivateDataBase;
-            PVBOXWDDM_ALLOCATION pAlloc = pFlip->Flip.Alloc.pAlloc;
-            VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pAlloc->AllocData.SurfDesc.VidPnSourceId];
-            vboxWddmAddrSetVram(&pAlloc->AllocData.Addr, pFlip->Flip.Alloc.segmentIdAlloc, pFlip->Flip.Alloc.offAlloc);
-            vboxWddmAssignPrimary(pSource, pAlloc, pAlloc->AllocData.SurfDesc.VidPnSourceId);
-            vboxWddmGhDisplayCheckSetInfoFromSource(pDevExt, pSource);
-
-            Status = vboxVdmaDdiCmdFenceComplete(pDevExt, pContext->NodeOrdinal, pSubmitCommand->SubmissionFenceId,
-                    NT_SUCCESS(Status) ? DXGK_INTERRUPT_DMA_COMPLETED : DXGK_INTERRUPT_DMA_FAULTED);
-            break;
-        }
-        case VBOXVDMACMD_TYPE_DMA_PRESENT_CLRFILL:
-        {
-            PVBOXWDDM_DMA_PRIVATEDATA_CLRFILL pCF = (PVBOXWDDM_DMA_PRIVATEDATA_CLRFILL)pPrivateDataBase;
-            vboxWddmAddrSetVram(&pCF->ClrFill.Alloc.pAlloc->AllocData.Addr, pCF->ClrFill.Alloc.segmentIdAlloc, pCF->ClrFill.Alloc.offAlloc);
-
-            Status = vboxVdmaProcessClrFillCmd(pDevExt, pContext, pCF);
-            if (!NT_SUCCESS(Status))
-                WARN(("vboxVdmaProcessClrFillCmd failed, Status 0x%x", Status));
-
-            Status = vboxVdmaDdiCmdFenceComplete(pDevExt, pContext->NodeOrdinal, pSubmitCommand->SubmissionFenceId,
-                    NT_SUCCESS(Status) ? DXGK_INTERRUPT_DMA_COMPLETED : DXGK_INTERRUPT_DMA_FAULTED);
-            break;
-        }
-        case VBOXVDMACMD_TYPE_DMA_NOP:
-        {
-            Status = vboxVdmaDdiCmdFenceComplete(pDevExt, pContext->NodeOrdinal, pSubmitCommand->SubmissionFenceId, DXGK_INTERRUPT_DMA_COMPLETED);
-            AssertNtStatusSuccess(Status);
-            break;
-        }
-        default:
-        {
-            WARN(("unexpected command %d", enmCmd));
-#if 0 //def VBOX_WITH_VDMA
-            VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR *pPrivateData = (VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR*)pPrivateDataBase;
-            PVBOXVDMACBUF_DR pDr = vboxVdmaCBufDrCreate (&pDevExt->u.primary.Vdma, 0);
-            if (!pDr)
-            {
-                /** @todo try flushing.. */
-                LOGREL(("vboxVdmaCBufDrCreate returned NULL"));
-                return STATUS_INSUFFICIENT_RESOURCES;
-            }
-            // vboxVdmaCBufDrCreate zero initializes the pDr
-            //pDr->fFlags = 0;
-            pDr->cbBuf = pSubmitCommand->DmaBufferSubmissionEndOffset - pSubmitCommand->DmaBufferSubmissionStartOffset;
-            pDr->u32FenceId = pSubmitCommand->SubmissionFenceId;
-            pDr->rc = VERR_NOT_IMPLEMENTED;
-            if (pPrivateData)
-                pDr->u64GuestContext = (uint64_t)pPrivateData->pContext;
-        //    else    // vboxVdmaCBufDrCreate zero initializes the pDr
-        //        pDr->u64GuestContext = NULL;
-            pDr->Location.phBuf = pSubmitCommand->DmaBufferPhysicalAddress.QuadPart + pSubmitCommand->DmaBufferSubmissionStartOffset;
-
-            vboxVdmaCBufDrSubmit(pDevExt, &pDevExt->u.primary.Vdma, pDr);
-#endif
-            break;
-        }
-    }
-//    LOGF(("LEAVE, context(0x%x)", hAdapter));
-
-    return Status;
-}
-
-#ifdef VBOX_WITH_CROGL
-static NTSTATUS
-APIENTRY
-DxgkDdiPreemptCommandNew(
-    CONST HANDLE  hAdapter,
-    CONST DXGKARG_PREEMPTCOMMAND*  pPreemptCommand)
-{
-#ifdef VBOX_WITH_MESA3D
-    if (((PVBOXMP_DEVEXT)hAdapter)->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        return GaDxgkDdiPreemptCommand(hAdapter, pPreemptCommand);
-    }
-#endif
-    LOGF(("ENTER, hAdapter(0x%x)", hAdapter));
-
-    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
-
-    vboxVDbgBreakF();
-
-    VBoxCmdVbvaPreempt(pDevExt, &pDevExt->CmdVbva, pPreemptCommand->PreemptionFenceId);
-
-    LOGF(("LEAVE, hAdapter(0x%x)", hAdapter));
-
-    return STATUS_SUCCESS;
-}
-#endif
-
-static NTSTATUS
-APIENTRY
-DxgkDdiPreemptCommandLegacy(
-    CONST HANDLE  hAdapter,
-    CONST DXGKARG_PREEMPTCOMMAND*  pPreemptCommand)
-{
-    RT_NOREF(hAdapter, pPreemptCommand);
-    LOGF(("ENTER, hAdapter(0x%x)", hAdapter));
-
-    AssertFailed();
-    /** @todo fixme: implement */
-
-    LOGF(("LEAVE, hAdapter(0x%x)", hAdapter));
-
-    return STATUS_SUCCESS;
-}
-
-#ifdef VBOX_WITH_CROGL
-/*
- * DxgkDdiBuildPagingBuffer
- */
-static NTSTATUS
-APIENTRY
-DxgkDdiBuildPagingBufferNew(
-    CONST HANDLE  hAdapter,
-    DXGKARG_BUILDPAGINGBUFFER*  pBuildPagingBuffer)
-{
-#ifdef VBOX_WITH_MESA3D
-    if (((PVBOXMP_DEVEXT)hAdapter)->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        return GaDxgkDdiBuildPagingBuffer(hAdapter, pBuildPagingBuffer);
-    }
-#endif
-
-    RT_NOREF(hAdapter);
-    /* DxgkDdiBuildPagingBuffer should be made pageable. */
-    PAGED_CODE();
-
-    vboxVDbgBreakFv();
-
-    uint32_t cbBuffer = 0, cbPrivateData = 0;
-
-    LOGF(("ENTER context(0x%X), operation(0x%X) MultipassOffset(0x%X) DmaSizes(0x%X 0x%X)",
-        hAdapter, pBuildPagingBuffer->Operation, pBuildPagingBuffer->MultipassOffset,
-        pBuildPagingBuffer->DmaSize, pBuildPagingBuffer->DmaBufferPrivateDataSize));
-
-    /* Checking for bare minimum of DMA buffer sizes*/
-    if (pBuildPagingBuffer->DmaBufferPrivateDataSize < sizeof (VBOXCMDVBVA_HDR))
-    {
-        WARN(("pBuildPagingBuffer->DmaBufferPrivateDataSize(%d) < sizeof (VBOXCMDVBVA_HDR)", pBuildPagingBuffer->DmaBufferPrivateDataSize));
-        return STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-    }
-
-    if (pBuildPagingBuffer->DmaSize < VBOXWDDM_DUMMY_DMABUFFER_SIZE)
-    {
-        WARN(("pBuildPagingBuffer->DmaSize(%d) < VBOXWDDM_DUMMY_DMABUFFER_SIZE", pBuildPagingBuffer->DmaSize));
-        return STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-    }
-
-    VBOXCMDVBVA_HDR *pHdr = (VBOXCMDVBVA_HDR*)pBuildPagingBuffer->pDmaBufferPrivateData;
-
-    switch (pBuildPagingBuffer->Operation)
-    {
-        case DXGK_OPERATION_TRANSFER:
-        {
-#if 0
-            if (!pBuildPagingBuffer->Transfer.Flags.AllocationIsIdle)
-            {
-                WARN(("allocation is not idle"));
-                return STATUS_GRAPHICS_ALLOCATION_BUSY;
-            }
-#endif
-
-            if (pBuildPagingBuffer->DmaBufferPrivateDataSize < sizeof (VBOXCMDVBVA_SYSMEMCMD))
-            {
-                WARN(("private data too small"));
-                return STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-            }
-
-            Assert(!pBuildPagingBuffer->Transfer.MdlOffset);
-
-            if ((!pBuildPagingBuffer->Transfer.Source.SegmentId) == (!pBuildPagingBuffer->Transfer.Destination.SegmentId))
-            {
-                WARN(("we only support RAM <-> VRAM moves, Src Seg(%d), Dst Seg(%d)", pBuildPagingBuffer->Transfer.Source.SegmentId, pBuildPagingBuffer->Transfer.Destination.SegmentId));
-                return STATUS_INVALID_PARAMETER;
-            }
-
-            PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pBuildPagingBuffer->Transfer.hAllocation;
-            if (!pAlloc)
-            {
-                WARN(("allocation is null"));
-                return STATUS_INVALID_PARAMETER;
-            }
-
-            if (pAlloc->AllocData.hostID)
-            {
-                cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-                cbPrivateData = sizeof (*pHdr);
-
-                pHdr->u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
-                pHdr->u8Flags = 0;
-                pHdr->u.u8PrimaryID = 0;
-                pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-                break;
-            }
-
-            if (pBuildPagingBuffer->DmaSize < sizeof (VBOXCMDVBVA_PAGING_TRANSFER))
-            {
-                WARN(("pBuildPagingBuffer->DmaSize(%d) < sizeof VBOXCMDVBVA_PAGING_TRANSFER (%d)", pBuildPagingBuffer->DmaSize , sizeof (VBOXCMDVBVA_PAGING_TRANSFER)));
-                /** @todo can this actually happen? what status to return? */
-                return STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-            }
-
-            VBOXCMDVBVA_PAGING_TRANSFER *pPaging = (VBOXCMDVBVA_PAGING_TRANSFER*)pBuildPagingBuffer->pDmaBuffer;
-            pPaging->Hdr.u8OpCode = VBOXCMDVBVA_OPTYPE_PAGING_TRANSFER;
-            /* sanity */
-            pPaging->Hdr.u8Flags = 0;
-            pPaging->Hdr.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-
-            PMDL pMdl;
-            uint32_t offVRAM;
-            BOOLEAN fIn;
-            UINT SegmentId;
-
-            if (pBuildPagingBuffer->Transfer.Source.SegmentId)
-            {
-                SegmentId = pBuildPagingBuffer->Transfer.Source.SegmentId;
-                Assert(!pBuildPagingBuffer->Transfer.Destination.SegmentId);
-                Assert(!pBuildPagingBuffer->Transfer.Source.SegmentAddress.HighPart);
-                offVRAM = pBuildPagingBuffer->Transfer.Source.SegmentAddress.LowPart;
-                pMdl = pBuildPagingBuffer->Transfer.Destination.pMdl;
-                fIn = FALSE;
-            }
-            else
-            {
-                SegmentId = pBuildPagingBuffer->Transfer.Destination.SegmentId;
-                Assert(pBuildPagingBuffer->Transfer.Destination.SegmentId);
-                Assert(!pBuildPagingBuffer->Transfer.Source.SegmentId);
-                Assert(!pBuildPagingBuffer->Transfer.Destination.SegmentAddress.HighPart);
-                offVRAM = pBuildPagingBuffer->Transfer.Destination.SegmentAddress.LowPart;
-                pMdl = pBuildPagingBuffer->Transfer.Source.pMdl;
-                fIn = TRUE;
-            }
-
-            if (SegmentId != 1)
-            {
-                WARN(("SegmentId"));
-                cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-                break;
-            }
-
-            Assert(!(pBuildPagingBuffer->Transfer.TransferSize & PAGE_OFFSET_MASK));
-            Assert(!(offVRAM & PAGE_OFFSET_MASK));
-            uint32_t cPages = (uint32_t)(pBuildPagingBuffer->Transfer.TransferSize >> PAGE_SHIFT);
-            Assert(cPages > pBuildPagingBuffer->MultipassOffset);
-            cPages -= pBuildPagingBuffer->MultipassOffset;
-            uint32_t iFirstPage = pBuildPagingBuffer->MultipassOffset;
-            uint32_t cPagesWritten;
-            offVRAM += pBuildPagingBuffer->Transfer.TransferOffset + (pBuildPagingBuffer->MultipassOffset << PAGE_SHIFT);
-
-            pPaging->Data.Alloc.u.offVRAM = offVRAM;
-            if (fIn)
-                pPaging->Hdr.u8Flags |= VBOXCMDVBVA_OPF_PAGING_TRANSFER_IN;
-            cbBuffer = VBoxCVDdiPTransferVRamSysBuildEls(pPaging, pMdl, iFirstPage, cPages, pBuildPagingBuffer->DmaSize, &cPagesWritten);
-            if (cPagesWritten != cPages)
-                pBuildPagingBuffer->MultipassOffset += cPagesWritten;
-            else
-                pBuildPagingBuffer->MultipassOffset = 0;
-
-            VBOXCMDVBVA_SYSMEMCMD *pSysMemCmd = (VBOXCMDVBVA_SYSMEMCMD*)pBuildPagingBuffer->pDmaBufferPrivateData;
-
-            cbPrivateData = sizeof (*pSysMemCmd);
-
-            pSysMemCmd->Hdr.u8OpCode = VBOXCMDVBVA_OPTYPE_SYSMEMCMD;
-            pSysMemCmd->Hdr.u8Flags = cbBuffer & 0xff;
-            pSysMemCmd->Hdr.u.u8PrimaryID = (cbBuffer >> 8) & 0xff;
-            pSysMemCmd->Hdr.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-            pSysMemCmd->phCmd = 0;
-
-            break;
-        }
-        case DXGK_OPERATION_FILL:
-        {
-            Assert(pBuildPagingBuffer->Fill.FillPattern == 0);
-            PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pBuildPagingBuffer->Fill.hAllocation;
-            if (!pAlloc)
-            {
-                WARN(("allocation is null"));
-                return STATUS_INVALID_PARAMETER;
-            }
-
-            if (pAlloc->AllocData.hostID || pBuildPagingBuffer->Fill.Destination.SegmentId != 1)
-            {
-                if (!pAlloc->AllocData.hostID)
-                {
-                    WARN(("unexpected segment id"));
-                }
-
-                cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-                cbPrivateData = sizeof (*pHdr);
-
-                pHdr->u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
-                pHdr->u8Flags = 0;
-                pHdr->u.u8PrimaryID = 0;
-                pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-                break;
-            }
-
-            if (pBuildPagingBuffer->DmaBufferPrivateDataSize < sizeof (VBOXCMDVBVA_PAGING_FILL))
-            {
-                WARN(("private data too small"));
-                return STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-            }
-
-            VBOXCMDVBVA_PAGING_FILL *pFill = (VBOXCMDVBVA_PAGING_FILL*)pBuildPagingBuffer->pDmaBufferPrivateData;
-            pFill->Hdr.u8OpCode = VBOXCMDVBVA_OPTYPE_PAGING_FILL;
-            pFill->Hdr.u8Flags = 0;
-            pFill->Hdr.u.u8PrimaryID = 0;
-            pFill->Hdr.u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-            pFill->u32CbFill = (uint32_t)pBuildPagingBuffer->Fill.FillSize;
-            pFill->u32Pattern = pBuildPagingBuffer->Fill.FillPattern;
-            Assert(!pBuildPagingBuffer->Fill.Destination.SegmentAddress.HighPart);
-            pFill->offVRAM = pBuildPagingBuffer->Fill.Destination.SegmentAddress.LowPart;
-
-            cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-            cbPrivateData = sizeof (*pFill);
-
-            break;
-        }
-        case DXGK_OPERATION_DISCARD_CONTENT:
-        {
-            PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pBuildPagingBuffer->DiscardContent.hAllocation;
-            if (!pAlloc)
-            {
-                WARN(("allocation is null"));
-                return STATUS_INVALID_PARAMETER;
-            }
-//            WARN(("Do we need to do anything here?"));
-            break;
-        }
-        default:
-        {
-            WARN(("unsupported op (%d)", pBuildPagingBuffer->Operation));
-            break;
-        }
-    }
-
-    Assert(cbPrivateData >= sizeof (VBOXCMDVBVA_HDR) || pBuildPagingBuffer->Operation == DXGK_OPERATION_DISCARD_CONTENT);
-    Assert(pBuildPagingBuffer->Operation == DXGK_OPERATION_DISCARD_CONTENT || cbBuffer);
-    Assert(cbBuffer <= pBuildPagingBuffer->DmaSize);
-    Assert(cbBuffer == 0 || cbBuffer >= sizeof (VBOXCMDVBVA_PAGING_TRANSFER) || cbBuffer == VBOXWDDM_DUMMY_DMABUFFER_SIZE);
-    AssertCompile(VBOXWDDM_DUMMY_DMABUFFER_SIZE < 8);
-
-    pHdr->u2.complexCmdEl.u16CbCmdHost = cbPrivateData;
-    pHdr->u2.complexCmdEl.u16CbCmdGuest = cbBuffer;
-
-    pBuildPagingBuffer->pDmaBuffer = ((uint8_t*)pBuildPagingBuffer->pDmaBuffer) + cbBuffer;
-    pBuildPagingBuffer->pDmaBufferPrivateData = ((uint8_t*)pBuildPagingBuffer->pDmaBufferPrivateData) + cbPrivateData;
-
-    LOGF(("LEAVE context(0x%X), MultipassOffset(0x%X) cbBuffer(0x%X) cbPrivateData(0x%X)",
-        hAdapter, pBuildPagingBuffer->MultipassOffset, cbBuffer, cbPrivateData));
-
-    if (pBuildPagingBuffer->MultipassOffset)
-        return STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-    return STATUS_SUCCESS;
-}
-#endif
-
-static NTSTATUS
-APIENTRY
-DxgkDdiBuildPagingBufferLegacy(
-    CONST HANDLE  hAdapter,
-    DXGKARG_BUILDPAGINGBUFFER*  pBuildPagingBuffer)
-{
-    /* DxgkDdiBuildPagingBuffer should be made pageable. */
-    PAGED_CODE();
-
-    vboxVDbgBreakFv();
-
-    NTSTATUS Status = STATUS_SUCCESS;
-    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
-
-    LOGF(("ENTER, context(0x%x)", hAdapter));
-
-    uint32_t cbCmdDma = 0;
-
-    /** @todo */
-    switch (pBuildPagingBuffer->Operation)
-    {
-        case DXGK_OPERATION_TRANSFER:
-        {
-            cbCmdDma = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-#ifdef VBOX_WITH_VDMA
-#if 0
-            if ((!pBuildPagingBuffer->Transfer.Source.SegmentId) != (!pBuildPagingBuffer->Transfer.Destination.SegmentId))
-            {
-                PVBOXVDMACMD pCmd = (PVBOXVDMACMD)pBuildPagingBuffer->pDmaBuffer;
-                pCmd->enmType = VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER_VRAMSYS;
-                pCmd->u32CmdSpecific = 0;
-                PVBOXVDMACMD_DMA_BPB_TRANSFER_VRAMSYS pBody = VBOXVDMACMD_BODY(pCmd, VBOXVDMACMD_DMA_BPB_TRANSFER_VRAMSYS);
-                PMDL pMdl;
-                uint32_t cPages = (pBuildPagingBuffer->Transfer.TransferSize + 0xfff) >> 12;
-                cPages -= pBuildPagingBuffer->MultipassOffset;
-                uint32_t iFirstPage = pBuildPagingBuffer->Transfer.MdlOffset + pBuildPagingBuffer->MultipassOffset;
-                uint32_t cPagesRemaining;
-                if (pBuildPagingBuffer->Transfer.Source.SegmentId)
-                {
-                    uint64_t off = pBuildPagingBuffer->Transfer.Source.SegmentAddress.QuadPart;
-                    off += pBuildPagingBuffer->Transfer.TransferOffset + (pBuildPagingBuffer->MultipassOffset << PAGE_SHIFT);
-                    pBody->offVramBuf = off;
-                    pMdl = pBuildPagingBuffer->Transfer.Source.pMdl;
-                    pBody->fFlags = 0;//VBOXVDMACMD_DMA_BPB_TRANSFER_VRAMSYS_SYS2VRAM
-                }
-                else
-                {
-                    uint64_t off = pBuildPagingBuffer->Transfer.Destination.SegmentAddress.QuadPart;
-                    off += pBuildPagingBuffer->Transfer.TransferOffset + (pBuildPagingBuffer->MultipassOffset << PAGE_SHIFT);
-                    pBody->offVramBuf = off;
-                    pMdl = pBuildPagingBuffer->Transfer.Destination.pMdl;
-                    pBody->fFlags = VBOXVDMACMD_DMA_BPB_TRANSFER_VRAMSYS_SYS2VRAM;
-                }
-
-                uint32_t sbBufferUsed = vboxWddmBpbTransferVRamSysBuildEls(pBody, pMdl, iFirstPage, cPages, pBuildPagingBuffer->DmaSize, &cPagesRemaining);
-                Assert(sbBufferUsed);
-            }
-
-#else
-            PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pBuildPagingBuffer->Transfer.hAllocation;
-            Assert(pAlloc);
-            if (pAlloc
-                    && !pAlloc->fRcFlags.Overlay /* overlay surfaces actually contain a valid data */
-                    && pAlloc->enmType != VBOXWDDM_ALLOC_TYPE_STD_SHADOWSURFACE  /* shadow primary - also */
-                    && pAlloc->enmType != VBOXWDDM_ALLOC_TYPE_UMD_HGSMI_BUFFER /* hgsmi buffer - also */
-                    )
-            {
-                /* we do not care about the others for now */
-                Status = STATUS_SUCCESS;
-                break;
-            }
-            UINT cbCmd = VBOXVDMACMD_SIZE(VBOXVDMACMD_DMA_BPB_TRANSFER);
-            VBOXVDMACBUF_DR RT_UNTRUSTED_VOLATILE_HOST *pDr = vboxVdmaCBufDrCreate(&pDevExt->u.primary.Vdma, cbCmd);
-            Assert(pDr);
-            if (pDr)
-            {
-                SIZE_T cbTransfered = 0;
-                SIZE_T cbTransferSize = pBuildPagingBuffer->Transfer.TransferSize;
-                VBOXVDMACMD RT_UNTRUSTED_VOLATILE_HOST *pHdr = VBOXVDMACBUF_DR_TAIL(pDr, VBOXVDMACMD);
-                do
-                {
-                    // vboxVdmaCBufDrCreate zero initializes the pDr
-                    pDr->fFlags = VBOXVDMACBUF_FLAG_BUF_FOLLOWS_DR;
-                    pDr->cbBuf = cbCmd;
-                    pDr->rc = VERR_NOT_IMPLEMENTED;
-
-                    pHdr->enmType = VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER;
-                    pHdr->u32CmdSpecific = 0;
-                    VBOXVDMACMD_DMA_BPB_TRANSFER RT_UNTRUSTED_VOLATILE_HOST *pBody
-                        = VBOXVDMACMD_BODY(pHdr, VBOXVDMACMD_DMA_BPB_TRANSFER);
-//                    pBody->cbTransferSize = (uint32_t)pBuildPagingBuffer->Transfer.TransferSize;
-                    pBody->fFlags = 0;
-                    SIZE_T cSrcPages = (cbTransferSize + 0xfff ) >> 12;
-                    SIZE_T cDstPages = cSrcPages;
-
-                    if (pBuildPagingBuffer->Transfer.Source.SegmentId)
-                    {
-                        uint64_t off = pBuildPagingBuffer->Transfer.Source.SegmentAddress.QuadPart;
-                        off += pBuildPagingBuffer->Transfer.TransferOffset + cbTransfered;
-                        pBody->Src.offVramBuf = off;
-                        pBody->fFlags |= VBOXVDMACMD_DMA_BPB_TRANSFER_F_SRC_VRAMOFFSET;
-                    }
-                    else
-                    {
-                        UINT index = pBuildPagingBuffer->Transfer.MdlOffset + (UINT)(cbTransfered>>12);
-                        pBody->Src.phBuf = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Source.pMdl)[index] << PAGE_SHIFT;
-                        PFN_NUMBER num = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Source.pMdl)[index];
-                        cSrcPages = 1;
-                        for (UINT i = 1; i < ((cbTransferSize - cbTransfered + 0xfff) >> 12); ++i)
-                        {
-                            PFN_NUMBER cur = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Source.pMdl)[index+i];
-                            if(cur != ++num)
-                            {
-                                cSrcPages+= i-1;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (pBuildPagingBuffer->Transfer.Destination.SegmentId)
-                    {
-                        uint64_t off = pBuildPagingBuffer->Transfer.Destination.SegmentAddress.QuadPart;
-                        off += pBuildPagingBuffer->Transfer.TransferOffset;
-                        pBody->Dst.offVramBuf = off + cbTransfered;
-                        pBody->fFlags |= VBOXVDMACMD_DMA_BPB_TRANSFER_F_DST_VRAMOFFSET;
-                    }
-                    else
-                    {
-                        UINT index = pBuildPagingBuffer->Transfer.MdlOffset + (UINT)(cbTransfered>>12);
-                        pBody->Dst.phBuf = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Destination.pMdl)[index] << PAGE_SHIFT;
-                        PFN_NUMBER num = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Destination.pMdl)[index];
-                        cDstPages = 1;
-                        for (UINT i = 1; i < ((cbTransferSize - cbTransfered + 0xfff) >> 12); ++i)
-                        {
-                            PFN_NUMBER cur = MmGetMdlPfnArray(pBuildPagingBuffer->Transfer.Destination.pMdl)[index+i];
-                            if(cur != ++num)
-                            {
-                                cDstPages+= i-1;
-                                break;
-                            }
-                        }
-                    }
-
-                    SIZE_T cbCurTransfer;
-                    cbCurTransfer = RT_MIN(cbTransferSize - cbTransfered, (SIZE_T)cSrcPages << PAGE_SHIFT);
-                    cbCurTransfer = RT_MIN(cbCurTransfer, (SIZE_T)cDstPages << PAGE_SHIFT);
-
-                    pBody->cbTransferSize = (UINT)cbCurTransfer;
-                    Assert(!(cbCurTransfer & 0xfff));
-
-                    int rc = vboxVdmaCBufDrSubmitSynch(pDevExt, &pDevExt->u.primary.Vdma, pDr);
-                    AssertRC(rc);
-                    if (RT_SUCCESS(rc))
-                    {
-                        Status = STATUS_SUCCESS;
-                        cbTransfered += cbCurTransfer;
-                    }
-                    else
-                        Status = STATUS_UNSUCCESSFUL;
-                } while (cbTransfered < cbTransferSize);
-                Assert(cbTransfered == cbTransferSize);
-                vboxVdmaCBufDrFree(&pDevExt->u.primary.Vdma, pDr);
-            }
-            else
-            {
-                /** @todo try flushing.. */
-                LOGREL(("vboxVdmaCBufDrCreate returned NULL"));
-                Status = STATUS_INSUFFICIENT_RESOURCES;
-            }
-#endif
-#endif /* #ifdef VBOX_WITH_VDMA */
-            break;
-        }
-        case DXGK_OPERATION_FILL:
-        {
-            cbCmdDma = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-            Assert(pBuildPagingBuffer->Fill.FillPattern == 0);
-            /*PVBOXWDDM_ALLOCATION pAlloc = (PVBOXWDDM_ALLOCATION)pBuildPagingBuffer->Fill.hAllocation; - unused. Incomplete code? */
-//            pBuildPagingBuffer->pDmaBuffer = (uint8_t*)pBuildPagingBuffer->pDmaBuffer + VBOXVDMACMD_SIZE(VBOXVDMACMD_DMA_BPB_FILL);
-            break;
-        }
-        case DXGK_OPERATION_DISCARD_CONTENT:
-        {
-//            AssertBreakpoint();
-            break;
-        }
-        default:
-        {
-            WARN(("unsupported op (%d)", pBuildPagingBuffer->Operation));
-            break;
-        }
-    }
-
-    if (cbCmdDma)
-    {
-        pBuildPagingBuffer->pDmaBuffer = ((uint8_t*)pBuildPagingBuffer->pDmaBuffer) + cbCmdDma;
-    }
-
-    LOGF(("LEAVE, context(0x%x)", hAdapter));
-
-    return Status;
-
-}
 
 NTSTATUS
@@ -4566 +3356 @@
         switch (pEscapeHdr->escapeCode)
         {
-#ifdef VBOX_WITH_CRHGSMI
-            case VBOXESC_UHGSMI_SUBMIT:
-            {
-                if (pDevExt->fCmdVbvaEnabled)
-                {
-                    WARN(("VBOXESC_UHGSMI_SUBMIT not supported for CmdVbva mode"));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-                /* submit VBOXUHGSMI command */
-                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
-                PVBOXDISPIFESCAPE_UHGSMI_SUBMIT pSubmit = (PVBOXDISPIFESCAPE_UHGSMI_SUBMIT)pEscapeHdr;
-                Assert(pEscape->PrivateDriverDataSize >= sizeof (VBOXDISPIFESCAPE_UHGSMI_SUBMIT)
-                        && pEscape->PrivateDriverDataSize == RT_UOFFSETOF_DYN(VBOXDISPIFESCAPE_UHGSMI_SUBMIT, aBuffers[pEscapeHdr->u32CmdSpecific]));
-                if (   pEscape->PrivateDriverDataSize >= sizeof (VBOXDISPIFESCAPE_GETVBOXVIDEOCMCMD)
-                    && pEscape->PrivateDriverDataSize == RT_UOFFSETOF_DYN(VBOXDISPIFESCAPE_UHGSMI_SUBMIT, aBuffers[pEscapeHdr->u32CmdSpecific]))
-                {
-                    Status = vboxVideoAMgrCtxAllocSubmit(pDevExt, &pContext->AllocContext, pEscapeHdr->u32CmdSpecific, pSubmit->aBuffers);
-                    AssertNtStatusSuccess(Status);
-                }
-                else
-                    Status = STATUS_BUFFER_TOO_SMALL;
-
-                break;
-            }
-
-            case VBOXESC_UHGSMI_ALLOCATE:
-            {
-                /* allocate VBOXUHGSMI buffer */
-                if (pDevExt->fCmdVbvaEnabled)
-                {
-                    WARN(("VBOXESC_UHGSMI_ALLOCATE not supported for CmdVbva mode"));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-
-                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
-                PVBOXDISPIFESCAPE_UHGSMI_ALLOCATE pAlocate = (PVBOXDISPIFESCAPE_UHGSMI_ALLOCATE)pEscapeHdr;
-                Assert(pEscape->PrivateDriverDataSize == sizeof (VBOXDISPIFESCAPE_UHGSMI_ALLOCATE));
-                if (pEscape->PrivateDriverDataSize == sizeof (VBOXDISPIFESCAPE_UHGSMI_ALLOCATE))
-                {
-                    Status = vboxVideoAMgrCtxAllocCreate(&pContext->AllocContext, &pAlocate->Alloc);
-                    AssertNtStatusSuccess(Status);
-                }
-                else
-                    Status = STATUS_BUFFER_TOO_SMALL;
-
-                break;
-            }
-
-            case VBOXESC_UHGSMI_DEALLOCATE:
-            {
-                if (pDevExt->fCmdVbvaEnabled)
-                {
-                    WARN(("VBOXESC_UHGSMI_DEALLOCATE not supported for CmdVbva mode"));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-                /* deallocate VBOXUHGSMI buffer */
-                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
-                PVBOXDISPIFESCAPE_UHGSMI_DEALLOCATE pDealocate = (PVBOXDISPIFESCAPE_UHGSMI_DEALLOCATE)pEscapeHdr;
-                Assert(pEscape->PrivateDriverDataSize == sizeof (VBOXDISPIFESCAPE_UHGSMI_DEALLOCATE));
-                if (pEscape->PrivateDriverDataSize == sizeof (VBOXDISPIFESCAPE_UHGSMI_DEALLOCATE))
-                {
-                    Status = vboxVideoAMgrCtxAllocDestroy(&pContext->AllocContext, pDealocate->hAlloc);
-                    AssertNtStatusSuccess(Status);
-                }
-                else
-                    Status = STATUS_BUFFER_TOO_SMALL;
-
-                break;
-            }
-
-            case VBOXESC_CRHGSMICTLCON_CALL:
-            {
-                if (pDevExt->fCmdVbvaEnabled)
-                {
-                    WARN(("VBOXESC_CRHGSMICTLCON_CALL not supported for CmdVbva mode"));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-
-                PVBOXDISPIFESCAPE_CRHGSMICTLCON_CALL pCall = (PVBOXDISPIFESCAPE_CRHGSMICTLCON_CALL)pEscapeHdr;
-                if (pEscape->PrivateDriverDataSize >= sizeof (*pCall))
-                {
-                    /* this is true due to the above condition */
-                    Assert(pEscape->PrivateDriverDataSize > RT_OFFSETOF(VBOXDISPIFESCAPE_CRHGSMICTLCON_CALL, CallInfo));
-                    int rc = VBoxMpCrCtlConCallUserData(&pDevExt->CrCtlCon, &pCall->CallInfo, pEscape->PrivateDriverDataSize - RT_OFFSETOF(VBOXDISPIFESCAPE_CRHGSMICTLCON_CALL, CallInfo));
-                    pEscapeHdr->u32CmdSpecific = (uint32_t)rc;
-                    Status = STATUS_SUCCESS; /* <- always return success here, otherwise the private data buffer modifications
-                                              * i.e. rc status stored in u32CmdSpecific will not be copied to user mode */
-                    if (!RT_SUCCESS(rc))
-                        WARN(("VBoxMpCrUmCtlConCall failed, rc(%d)", rc));
-                }
-                else
-                {
-                    WARN(("buffer too small!"));
-                    Status = STATUS_BUFFER_TOO_SMALL;
-                }
-
-                break;
-            }
-
-            case VBOXESC_CRHGSMICTLCON_GETCLIENTID:
-            {
-                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
-                if (!pContext)
-                {
-                    WARN(("context not specified"));
-                    return STATUS_INVALID_PARAMETER;
-                }
-                if (pEscape->PrivateDriverDataSize == sizeof (*pEscapeHdr))
-                {
-                    pEscapeHdr->u32CmdSpecific = pContext->u32CrConClientID;
-                    Status = STATUS_SUCCESS;
-                }
-                else
-                {
-                    WARN(("unexpected buffer size!"));
-                    Status = STATUS_INVALID_PARAMETER;
-                }
-
-                break;
-            }
-
-            case VBOXESC_CRHGSMICTLCON_GETHOSTCAPS:
-            {
-                if (pEscape->PrivateDriverDataSize == sizeof (*pEscapeHdr))
-                {
-                    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
-                        pEscapeHdr->u32CmdSpecific = VBoxMpCrGetHostCaps();
-#ifdef VBOX_WITH_MESA3D
-                    else if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-                        /** @todo User-mode driver probably should not need it in Gallium mode. */
-                        pEscapeHdr->u32CmdSpecific = CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_CMDVBVA;
-#endif
-                    else
-                        pEscapeHdr->u32CmdSpecific = 0;
-                    Status = STATUS_SUCCESS;
-                }
-                else
-                {
-                    WARN(("unexpected buffer size!"));
-                    Status = STATUS_INVALID_PARAMETER;
-                }
-
-                break;
-            }
-#endif
-
             case VBOXESC_SETVISIBLEREGION:
             {
@@ -4797 +3437 @@
                 Status = STATUS_SUCCESS;
                 break;
-#ifdef VBOX_WITH_CROGL
-            case VBOXESC_SETCTXHOSTID:
-            {
-                /* set swapchain information */
-                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
-                if (!pContext)
-                {
-                    WARN(("VBOXESC_SETCTXHOSTID: no context specified"));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-
-                if (pEscape->PrivateDriverDataSize != sizeof (VBOXDISPIFESCAPE))
-                {
-                    WARN(("VBOXESC_SETCTXHOSTID: invalid data size %d", pEscape->PrivateDriverDataSize));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-
-                int32_t hostID = (int32_t)pEscapeHdr->u32CmdSpecific;
-                if (hostID <= 0)
-                {
-                    WARN(("VBOXESC_SETCTXHOSTID: invalid hostID %d", hostID));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-
-                if (pContext->hostID)
-                {
-                    WARN(("VBOXESC_SETCTXHOSTID: context already has hostID specified"));
-                    Status = STATUS_INVALID_PARAMETER;
-                    break;
-                }
-
-                pContext->hostID = hostID;
-                Status = STATUS_SUCCESS;
-                break;
-            }
-            case VBOXESC_SWAPCHAININFO:
-            {
-                /* set swapchain information */
-                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pEscape->hContext;
-                Status = vboxWddmSwapchainCtxEscape(pDevExt, pContext, (PVBOXDISPIFESCAPE_SWAPCHAININFO)pEscapeHdr, pEscape->PrivateDriverDataSize);
-                AssertNtStatusSuccess(Status);
-                break;
-            }
-#endif
             case VBOXESC_CONFIGURETARGETS:
             {
@@ -5243 +3836 @@
 }
 
-typedef struct VBOXWDDM_QUERYCURFENCE_CB
-{
-    PVBOXMP_DEVEXT pDevExt;
-    ULONG MessageNumber;
-    ULONG uLastCompletedCmdFenceId;
-} VBOXWDDM_QUERYCURFENCE_CB, *PVBOXWDDM_QUERYCURFENCE_CB;
-
-static BOOLEAN vboxWddmQueryCurrentFenceCb(PVOID Context)
-{
-    PVBOXWDDM_QUERYCURFENCE_CB pdc = (PVBOXWDDM_QUERYCURFENCE_CB)Context;
-    PVBOXMP_DEVEXT pDevExt = pdc->pDevExt;
-    BOOL bRc = DxgkDdiInterruptRoutineLegacy(pDevExt, pdc->MessageNumber);
-    pdc->uLastCompletedCmdFenceId = pDevExt->u.primary.Vdma.uLastCompletedPagingBufferCmdFenceId;
-    return bRc;
-}
-
-#ifdef VBOX_WITH_CROGL
-static NTSTATUS
-APIENTRY
-DxgkDdiQueryCurrentFenceNew(
-    CONST HANDLE  hAdapter,
-    DXGKARG_QUERYCURRENTFENCE*  pCurrentFence)
-{
-#ifdef VBOX_WITH_MESA3D
-    if (((PVBOXMP_DEVEXT)hAdapter)->enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
-    {
-        return GaDxgkDdiQueryCurrentFence(hAdapter, pCurrentFence);
-    }
-#endif
-    LOGF(("ENTER, hAdapter(0x%x)", hAdapter));
-
-    vboxVDbgBreakF();
-
-    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
-
-    WARN(("=>DxgkDdiQueryCurrentFenceNew"));
-
-    uint32_t u32FenceSubmitted = 0;
-    uint32_t u32FenceCompleted = 0;
-    uint32_t u32FenceProcessed = 0;
-
-    LARGE_INTEGER DelayInterval;
-    DelayInterval.QuadPart = -10LL * 1000LL * 1000LL;
-
-    for (;;)
-    {
-        u32FenceCompleted = VBoxCmdVbvaCheckCompleted(pDevExt, &pDevExt->CmdVbva, false, &u32FenceSubmitted, &u32FenceProcessed);
-        if (!u32FenceCompleted)
-        {
-            WARN(("VBoxCmdVbvaCheckCompleted failed"));
-            return STATUS_UNSUCCESSFUL;
-        }
-
-        if (u32FenceSubmitted == u32FenceProcessed)
-            break;
-
-        WARN(("uncompleted fences, u32FenceSubmitted(%d), u32FenceCompleted(%d) u32FenceProcessed(%d)", u32FenceSubmitted, u32FenceCompleted, u32FenceProcessed));
-
-        NTSTATUS Status = KeDelayExecutionThread(KernelMode, FALSE, &DelayInterval);
-        if (Status != STATUS_SUCCESS)
-            WARN(("KeDelayExecutionThread failed %#x", Status));
-    }
-
-    pCurrentFence->CurrentFence = u32FenceCompleted;
-
-    WARN(("<=DxgkDdiQueryCurrentFenceNew"));
-
-    LOGF(("LEAVE, hAdapter(0x%x)", hAdapter));
-
-    return STATUS_SUCCESS;
-}
-#endif
-
-static NTSTATUS
-APIENTRY
-DxgkDdiQueryCurrentFenceLegacy(
-    CONST HANDLE  hAdapter,
-    DXGKARG_QUERYCURRENTFENCE*  pCurrentFence)
-{
-    LOGF(("ENTER, hAdapter(0x%x)", hAdapter));
-
-    vboxVDbgBreakF();
-
-    PVBOXMP_DEVEXT pDevExt = (PVBOXMP_DEVEXT)hAdapter;
-    VBOXWDDM_QUERYCURFENCE_CB context = {0};
-    context.pDevExt = pDevExt;
-    BOOLEAN bRet;
-    NTSTATUS Status = pDevExt->u.primary.DxgkInterface.DxgkCbSynchronizeExecution(
-            pDevExt->u.primary.DxgkInterface.DeviceHandle,
-            vboxWddmQueryCurrentFenceCb,
-            &context,
-            0, /* IN ULONG MessageNumber */
-            &bRet);
-    AssertNtStatusSuccess(Status);
-    if (Status == STATUS_SUCCESS)
-    {
-        pCurrentFence->CurrentFence = context.uLastCompletedCmdFenceId;
-    }
-
-    LOGF(("LEAVE, hAdapter(0x%x)", hAdapter));
-
-    return STATUS_SUCCESS;
-}
-
 NTSTATUS
 APIENTRY
@@ -6089 +4578 @@
 }
 
-#ifdef VBOX_WITH_CROGL
-static NTSTATUS
-APIENTRY
-DxgkDdiRenderNew(
-    CONST HANDLE  hContext,
-    DXGKARG_RENDER  *pRender)
-{
-    RT_NOREF(hContext);
-//    LOGF(("ENTER, hContext(0x%x)", hContext));
-    vboxVDbgBreakF();
-
-#ifdef VBOX_WITH_MESA3D
-    if (GaContextHwTypeIs((PVBOXWDDM_CONTEXT)hContext, VBOXVIDEO_HWTYPE_VMSVGA))
-    {
-        return GaDxgkDdiRender(hContext, pRender);
-    }
-#endif
-
-    if (pRender->DmaBufferPrivateDataSize < sizeof (VBOXCMDVBVA_HDR))
-    {
-        WARN(("pRender->DmaBufferPrivateDataSize(%d) < sizeof VBOXCMDVBVA_HDR (%d)",
-                pRender->DmaBufferPrivateDataSize , sizeof (VBOXCMDVBVA_HDR)));
-        /** @todo can this actually happen? what status to return? */
-        return STATUS_INVALID_PARAMETER;
-    }
-    if (pRender->CommandLength < sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR))
-    {
-        WARN(("Present->DmaBufferPrivateDataSize(%d) < sizeof VBOXWDDM_DMA_PRIVATEDATA_BASEHDR (%d)",
-                pRender->DmaBufferPrivateDataSize , sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR)));
-        return STATUS_INVALID_PARAMETER;
-    }
-    if (pRender->PatchLocationListOutSize < pRender->AllocationListSize)
-    {
-        WARN(("pRender->PatchLocationListOutSize(%d) < pRender->AllocationListSize(%d)",
-                pRender->PatchLocationListOutSize, pRender->AllocationListSize));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    NTSTATUS Status = STATUS_SUCCESS;
-
-    __try
-    {
-        PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR pInputHdr = (PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR)pRender->pCommand;
-
-        uint32_t cbBuffer = 0;
-        uint32_t cbPrivateData = 0;
-        uint32_t cbCmd = 0;
-        VBOXCMDVBVA_HDR* pCmd = (VBOXCMDVBVA_HDR*)pRender->pDmaBufferPrivateData;
-
-        switch (pInputHdr->enmCmd)
-        {
-            case VBOXVDMACMD_TYPE_CHROMIUM_CMD:
-            {
-                if (pRender->AllocationListSize >= (UINT32_MAX - RT_UOFFSETOF(VBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD, aBufInfos))/ RT_SIZEOFMEMB(VBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD, aBufInfos[0]))
-                {
-                    WARN(("Invalid AllocationListSize %d", pRender->AllocationListSize));
-                    return STATUS_INVALID_PARAMETER;
-                }
-
-                if (pRender->CommandLength != RT_UOFFSETOF_DYN(VBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD, aBufInfos[pRender->AllocationListSize]))
-                {
-                    WARN(("pRender->CommandLength (%d) != RT_OFFSETOF(VBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD, aBufInfos[pRender->AllocationListSize](%d)",
-                            pRender->CommandLength, (int)RT_UOFFSETOF_DYN(VBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD, aBufInfos[pRender->AllocationListSize])));
-                    return STATUS_INVALID_PARAMETER;
-                }
-
-                if (pRender->AllocationListSize >= (UINT32_MAX - RT_UOFFSETOF(VBOXCMDVBVA_CRCMD, Cmd.aBuffers))/ RT_SIZEOFMEMB(VBOXCMDVBVA_CRCMD, Cmd.aBuffers[0]))
-                {
-                    WARN(("Invalid AllocationListSize %d", pRender->AllocationListSize));
-                    return STATUS_INVALID_PARAMETER;
-                }
-
-                cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-                cbPrivateData = RT_UOFFSETOF_DYN(VBOXCMDVBVA_CRCMD, Cmd.aBuffers[pRender->AllocationListSize]);
-
-                if (pRender->DmaBufferPrivateDataSize < cbPrivateData)
-                {
-                    WARN(("pRender->DmaBufferPrivateDataSize too small %d, requested %d", pRender->DmaBufferPrivateDataSize, cbPrivateData));
-                    return STATUS_INVALID_PARAMETER;
-                }
-
-                if (pRender->DmaSize < cbBuffer)
-                {
-                    WARN(("dma buffer %d too small", pRender->DmaSize));
-                    return STATUS_INVALID_PARAMETER;
-                }
-
-    //            Assert(pRender->PatchLocationListOutSize == pRender->AllocationListSize);
-
-                if (pRender->PatchLocationListOutSize < pRender->AllocationListSize)
-                {
-                    WARN(("pRender->PatchLocationListOutSize too small %d, requested %d", pRender->PatchLocationListOutSize, pRender->AllocationListSize));
-                    return STATUS_INVALID_PARAMETER;
-                }
-
-                PVBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD pUmCmd = (PVBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD)pInputHdr;
-                VBOXCMDVBVA_CRCMD* pChromiumCmd = (VBOXCMDVBVA_CRCMD*)pRender->pDmaBufferPrivateData;
-
-                pChromiumCmd->Hdr.u8OpCode = VBOXCMDVBVA_OPTYPE_CRCMD;
-                pChromiumCmd->Hdr.u8Flags = 0;
-                pChromiumCmd->Cmd.cBuffers = pRender->AllocationListSize;
-
-                DXGK_ALLOCATIONLIST *pAllocationList = pRender->pAllocationList;
-                VBOXCMDVBVA_CRCMD_BUFFER *pSubmInfo = pChromiumCmd->Cmd.aBuffers;
-                PVBOXWDDM_UHGSMI_BUFFER_UI_SUBMIT_INFO pSubmUmInfo = pUmCmd->aBufInfos;
-
-                for (UINT i = 0; i < pRender->AllocationListSize; ++i, ++pRender->pPatchLocationListOut, ++pAllocationList, ++pSubmInfo, ++pSubmUmInfo)
-                {
-                    VBOXWDDM_UHGSMI_BUFFER_UI_SUBMIT_INFO SubmUmInfo = *pSubmUmInfo;
-                    D3DDDI_PATCHLOCATIONLIST* pPLL = pRender->pPatchLocationListOut;
-                    PVBOXWDDM_ALLOCATION pAlloc = vboxWddmGetAllocationFromAllocList(pAllocationList);
-                    if (SubmUmInfo.offData >= pAlloc->AllocData.SurfDesc.cbSize
-                            || SubmUmInfo.cbData > pAlloc->AllocData.SurfDesc.cbSize
-                            || SubmUmInfo.offData + SubmUmInfo.cbData > pAlloc->AllocData.SurfDesc.cbSize)
-                    {
-                        WARN(("invalid data"));
-                        return STATUS_INVALID_PARAMETER;
-                    }
-
-                    memset(pPLL, 0, sizeof (*pPLL));
-
-                    if (pAllocationList->SegmentId)
-                        pSubmInfo->offBuffer = pAllocationList->PhysicalAddress.LowPart + SubmUmInfo.offData;
-
-                    pSubmInfo->cbBuffer = SubmUmInfo.cbData;
-
-                    pPLL->AllocationIndex = i;
-                    pPLL->PatchOffset = RT_UOFFSETOF_DYN(VBOXCMDVBVA_CRCMD, Cmd.aBuffers[i].offBuffer);
-                    pPLL->AllocationOffset = SubmUmInfo.offData;
-                }
-
-                cbCmd = cbPrivateData;
-
-                break;
-            }
-            case VBOXVDMACMD_TYPE_DMA_NOP:
-            {
-                cbPrivateData = sizeof (VBOXCMDVBVA_HDR);
-                cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-
-                if (pRender->DmaBufferPrivateDataSize < cbPrivateData)
-                {
-                    WARN(("pRender->DmaBufferPrivateDataSize too small %d, requested %d", pRender->DmaBufferPrivateDataSize, cbPrivateData));
-                    return STATUS_INVALID_PARAMETER;
-                }
-
-                if (pRender->DmaSize < cbBuffer)
-                {
-                    WARN(("dma buffer %d too small", pRender->DmaSize));
-                    return STATUS_INVALID_PARAMETER;
-                }
-
-                pCmd->u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
-                pCmd->u8Flags = 0;
-
-                for (UINT i = 0; i < pRender->AllocationListSize; ++i, ++pRender->pPatchLocationListOut)
-                {
-                    D3DDDI_PATCHLOCATIONLIST* pPLL = pRender->pPatchLocationListOut;
-                    memset(pPLL, 0, sizeof (*pPLL));
-                    pPLL->AllocationIndex = i;
-                    pPLL->PatchOffset = ~0UL;
-                    pPLL->AllocationOffset = 0;
-                }
-
-                cbCmd = cbPrivateData;
-
-                break;
-            }
-            default:
-             {
-                 WARN(("unsupported render command %d", pInputHdr->enmCmd));
-                 return STATUS_INVALID_PARAMETER;
-             }
-        }
-
-        Assert(cbPrivateData >= sizeof (VBOXCMDVBVA_HDR));
-        pRender->pDmaBufferPrivateData = ((uint8_t*)pRender->pDmaBufferPrivateData) + cbPrivateData;
-        pRender->pDmaBuffer = ((uint8_t*)pRender->pDmaBuffer) + cbBuffer;
-
-        pCmd->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-        pCmd->u2.complexCmdEl.u16CbCmdHost = cbPrivateData;
-        pCmd->u2.complexCmdEl.u16CbCmdGuest = cbBuffer;
-    }
-    __except (EXCEPTION_EXECUTE_HANDLER)
-    {
-        Status = STATUS_INVALID_PARAMETER;
-        WARN(("invalid parameter"));
-    }
-//    LOGF(("LEAVE, hContext(0x%x)", hContext));
-
-    return Status;
-}
-#endif
-
-static void vboxWddmPatchLocationInit(D3DDDI_PATCHLOCATIONLIST *pPatchLocationListOut, UINT idx, UINT offPatch)
-{
-    memset(pPatchLocationListOut, 0, sizeof (*pPatchLocationListOut));
-    pPatchLocationListOut->AllocationIndex = idx;
-    pPatchLocationListOut->PatchOffset = offPatch;
-}
-
-static NTSTATUS
-APIENTRY
-DxgkDdiRenderLegacy(
-    CONST HANDLE  hContext,
-    DXGKARG_RENDER  *pRender)
-{
-    RT_NOREF(hContext);
-//    LOGF(("ENTER, hContext(0x%x)", hContext));
-
-    if (pRender->DmaBufferPrivateDataSize < sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR))
-    {
-        WARN(("Present->DmaBufferPrivateDataSize(%d) < sizeof VBOXWDDM_DMA_PRIVATEDATA_BASEHDR (%d)",
-                pRender->DmaBufferPrivateDataSize , sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR)));
-        return STATUS_INVALID_PARAMETER;
-    }
-    if (pRender->CommandLength < sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR))
-    {
-        WARN(("Present->DmaBufferPrivateDataSize(%d) < sizeof VBOXWDDM_DMA_PRIVATEDATA_BASEHDR (%d)",
-                pRender->DmaBufferPrivateDataSize , sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR)));
-        return STATUS_INVALID_PARAMETER;
-    }
-    if (pRender->DmaSize < pRender->CommandLength)
-    {
-        WARN(("pRender->DmaSize(%d) < pRender->CommandLength(%d)",
-                pRender->DmaSize, pRender->CommandLength));
-        return STATUS_INVALID_PARAMETER;
-    }
-    if (pRender->PatchLocationListOutSize < pRender->PatchLocationListInSize)
-    {
-        WARN(("pRender->PatchLocationListOutSize(%d) < pRender->PatchLocationListInSize(%d)",
-                pRender->PatchLocationListOutSize, pRender->PatchLocationListInSize));
-        return STATUS_INVALID_PARAMETER;
-    }
-    if (pRender->AllocationListSize != pRender->PatchLocationListInSize)
-    {
-        WARN(("pRender->AllocationListSize(%d) != pRender->PatchLocationListInSize(%d)",
-                pRender->AllocationListSize, pRender->PatchLocationListInSize));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    NTSTATUS Status = STATUS_SUCCESS;
-
-    __try
-    {
-        PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR pInputHdr = (PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR)pRender->pCommand;
-        switch (pInputHdr->enmCmd)
-        {
-            case VBOXVDMACMD_TYPE_DMA_NOP:
-            {
-                PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR pPrivateData = (PVBOXWDDM_DMA_PRIVATEDATA_BASEHDR)pRender->pDmaBufferPrivateData;
-                pPrivateData->enmCmd = VBOXVDMACMD_TYPE_DMA_NOP;
-                pRender->pDmaBufferPrivateData = (uint8_t*)pRender->pDmaBufferPrivateData + sizeof (VBOXWDDM_DMA_PRIVATEDATA_BASEHDR);
-                pRender->pDmaBuffer = ((uint8_t*)pRender->pDmaBuffer) + pRender->CommandLength;
-                for (UINT i = 0; i < pRender->PatchLocationListInSize; ++i)
-                {
-                    UINT offPatch = i * 4;
-                    if (offPatch + 4 > pRender->CommandLength)
-                    {
-                        WARN(("wrong offPatch"));
-                        return STATUS_INVALID_PARAMETER;
-                    }
-                    if (offPatch != pRender->pPatchLocationListIn[i].PatchOffset)
-                    {
-                        WARN(("wrong PatchOffset"));
-                        return STATUS_INVALID_PARAMETER;
-                    }
-                    if (i != pRender->pPatchLocationListIn[i].AllocationIndex)
-                    {
-                        WARN(("wrong AllocationIndex"));
-                        return STATUS_INVALID_PARAMETER;
-                    }
-                    vboxWddmPatchLocationInit(&pRender->pPatchLocationListOut[i], i, offPatch);
-                }
-                break;
-            }
-            default:
-            {
-                WARN(("unsupported command %d", pInputHdr->enmCmd));
-                return STATUS_INVALID_PARAMETER;
-            }
-        }
-    }
-    __except (EXCEPTION_EXECUTE_HANDLER)
-    {
-        Status = STATUS_INVALID_PARAMETER;
-        WARN(("invalid parameter"));
-    }
-//    LOGF(("LEAVE, hContext(0x%x)", hContext));
-
-    return Status;
-}
-
 #define VBOXVDMACMD_DMA_PRESENT_BLT_MINSIZE() (VBOXVDMACMD_SIZE(VBOXVDMACMD_DMA_PRESENT_BLT))
 #define VBOXVDMACMD_DMA_PRESENT_BLT_SIZE(_c) (VBOXVDMACMD_BODY_FIELD_OFFSET(UINT, VBOXVDMACMD_DMA_PRESENT_BLT, aDstSubRects[_c]))
@@ -6416 +4612 @@
     Assert(From == To);
     return From == To;
-}
-
-#ifdef VBOX_WITH_CROGL
-
-DECLINLINE(void) VBoxCVDdiFillAllocDescHostID(VBOXCMDVBVA_ALLOCDESC *pDesc, const VBOXWDDM_ALLOCATION *pAlloc)
-{
-    pDesc->Info.u.id = pAlloc->AllocData.hostID;
-    /* we do not care about wdth and height, zero them up though */
-    pDesc->u16Width = 0;
-    pDesc->u16Height = 0;
-}
-
-DECLINLINE(void) VBoxCVDdiFillAllocInfoOffVRAM(VBOXCMDVBVA_ALLOCINFO *pInfo, const DXGK_ALLOCATIONLIST *pList)
-{
-    Assert(!pList->PhysicalAddress.HighPart);
-    pInfo->u.offVRAM = pList->PhysicalAddress.LowPart;
-}
-
-DECLINLINE(void) VBoxCVDdiFillAllocDescOffVRAM(VBOXCMDVBVA_ALLOCDESC *pDesc, const VBOXWDDM_ALLOCATION *pAlloc, const DXGK_ALLOCATIONLIST *pList)
-{
-    VBoxCVDdiFillAllocInfoOffVRAM(&pDesc->Info, pList);
-    pDesc->u16Width = (uint16_t)pAlloc->AllocData.SurfDesc.width;
-    pDesc->u16Height = (uint16_t)pAlloc->AllocData.SurfDesc.height;
-}
-
-static NTSTATUS vboxWddmCmCmdBltIdNotIdFill(VBOXCMDVBVA_BLT_HDR *pBltHdr, const VBOXWDDM_ALLOCATION *pIdAlloc, const VBOXWDDM_ALLOCATION *pAlloc, const DXGK_ALLOCATIONLIST *pList,
-                            BOOLEAN fToId, uint32_t *poffPatch, uint32_t *poffRects)
-{
-    uint8_t fFlags;
-    Assert(pIdAlloc->AllocData.hostID);
-    Assert(!pAlloc->AllocData.hostID);
-
-    D3DDDIFORMAT enmFormat = vboxWddmFmtNoAlphaFormat(pAlloc->AllocData.SurfDesc.format);
-    if (enmFormat != D3DDDIFMT_X8R8G8B8)
-    {
-        WARN(("unsupported format"));
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    if (pIdAlloc->AllocData.SurfDesc.width == pAlloc->AllocData.SurfDesc.width
-            && pIdAlloc->AllocData.SurfDesc.height == pAlloc->AllocData.SurfDesc.height)
-    {
-        fFlags = VBOXCMDVBVA_OPF_BLT_TYPE_OFFPRIMSZFMT_OR_ID | VBOXCMDVBVA_OPF_OPERAND2_ISID;
-        VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID *pBlt = (VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID*)pBltHdr;
-        VBoxCVDdiFillAllocInfoOffVRAM(&pBlt->alloc, pList);
-        pBlt->id = pIdAlloc->AllocData.hostID;
-        *poffPatch = RT_UOFFSETOF(VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID, alloc.u.offVRAM);
-        *poffRects = RT_UOFFSETOF(VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID, aRects);
-    }
-    else
-    {
-        fFlags = VBOXCMDVBVA_OPF_BLT_TYPE_SAMEDIM_A8R8G8B8 | VBOXCMDVBVA_OPF_OPERAND2_ISID;
-        VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8 *pBlt = (VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8*)pBltHdr;
-        VBoxCVDdiFillAllocDescOffVRAM(&pBlt->alloc1, pAlloc, pList);
-        pBlt->info2.u.id = pIdAlloc->AllocData.hostID;
-        *poffPatch = RT_UOFFSETOF(VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8, alloc1.Info.u.offVRAM);
-        *poffRects = RT_UOFFSETOF(VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8, aRects);
-    }
-
-    if (fToId)
-        fFlags |= VBOXCMDVBVA_OPF_BLT_DIR_IN_2;
-
-    pBltHdr->Hdr.u8Flags |= fFlags;
-    return STATUS_SUCCESS;
-}
-
-static NTSTATUS vboxWddmCmCmdBltNotIdNotIdFill(VBOXCMDVBVA_BLT_HDR *pBltHdr, const VBOXWDDM_ALLOCATION *pSrcAlloc, const DXGK_ALLOCATIONLIST *pSrcList,
-        const VBOXWDDM_ALLOCATION *pDstAlloc, const DXGK_ALLOCATIONLIST *pDstList,
-                            uint32_t *poffSrcPatch, uint32_t *poffDstPatch, uint32_t *poffRects)
-{
-    if (pDstAlloc->AllocData.SurfDesc.width == pSrcAlloc->AllocData.SurfDesc.width
-            && pDstAlloc->AllocData.SurfDesc.height == pSrcAlloc->AllocData.SurfDesc.height)
-    {
-        pBltHdr->Hdr.u8Flags |= VBOXCMDVBVA_OPF_BLT_TYPE_SAMEDIM_A8R8G8B8;
-        VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8 *pBlt = (VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8*)pBltHdr;
-        VBoxCVDdiFillAllocDescOffVRAM(&pBlt->alloc1, pDstAlloc, pDstList);
-        VBoxCVDdiFillAllocInfoOffVRAM(&pBlt->info2, pSrcList);
-        *poffDstPatch = RT_UOFFSETOF(VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8, alloc1.Info.u.offVRAM);
-        *poffSrcPatch = RT_UOFFSETOF(VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8, info2.u.offVRAM);
-        *poffRects = RT_UOFFSETOF(VBOXCMDVBVA_BLT_SAMEDIM_A8R8G8B8, aRects);
-    }
-    else
-    {
-        pBltHdr->Hdr.u8Flags |= VBOXCMDVBVA_OPF_BLT_TYPE_GENERIC_A8R8G8B8;
-        VBOXCMDVBVA_BLT_GENERIC_A8R8G8B8 *pBlt = (VBOXCMDVBVA_BLT_GENERIC_A8R8G8B8*)pBltHdr;
-        VBoxCVDdiFillAllocDescOffVRAM(&pBlt->alloc1, pDstAlloc, pDstList);
-        VBoxCVDdiFillAllocDescOffVRAM(&pBlt->alloc2, pSrcAlloc, pSrcList);
-        *poffDstPatch = RT_UOFFSETOF(VBOXCMDVBVA_BLT_GENERIC_A8R8G8B8, alloc1.Info.u.offVRAM);
-        *poffSrcPatch = RT_UOFFSETOF(VBOXCMDVBVA_BLT_GENERIC_A8R8G8B8, alloc2.Info.u.offVRAM);
-        *poffRects = RT_UOFFSETOF(VBOXCMDVBVA_BLT_GENERIC_A8R8G8B8, aRects);
-    }
-    return STATUS_SUCCESS;
-}
-/**
- * DxgkDdiPresent
- */
-static NTSTATUS
-APIENTRY
-DxgkDdiPresentNew(
-    CONST HANDLE  hContext,
-    DXGKARG_PRESENT  *pPresent)
-{
-    RT_NOREF(hContext);
-    PAGED_CODE();
-
-//    LOGF(("ENTER, hContext(0x%x)", hContext));
-
-    vboxVDbgBreakFv();
-#ifdef VBOX_WITH_MESA3D
-    if (GaContextHwTypeIs((PVBOXWDDM_CONTEXT)hContext, VBOXVIDEO_HWTYPE_VMSVGA))
-    {
-        return GaDxgkDdiPresent(hContext, pPresent);
-    }
-#endif
-
-#ifdef VBOX_STRICT
-    PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)hContext;
-    PVBOXWDDM_DEVICE pDevice = pContext->pDevice;
-    PVBOXMP_DEVEXT pDevExt = pDevice->pAdapter;
-#endif
-    uint32_t cbBuffer = 0;
-    uint32_t cbPrivateData = 0;
-
-    if (pPresent->DmaBufferPrivateDataSize < sizeof (VBOXCMDVBVA_HDR))
-    {
-        WARN(("Present->DmaBufferPrivateDataSize(%d) < sizeof VBOXCMDVBVA_HDR (%d)", pPresent->DmaBufferPrivateDataSize , sizeof (VBOXCMDVBVA_HDR)));
-        /** @todo can this actually happen? what status to return? */
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    VBOXCMDVBVA_HDR* pHdr = (VBOXCMDVBVA_HDR*)pPresent->pDmaBufferPrivateData;
-
-    UINT u32SrcPatch = ~0UL;
-    UINT u32DstPatch = ~0UL;
-    BOOLEAN fPatchSrc = false;
-    BOOLEAN fPatchDst = false;
-    VBOXCMDVBVA_RECT *paRects = NULL;
-
-    if (pPresent->DmaSize < VBOXWDDM_DUMMY_DMABUFFER_SIZE)
-    {
-        WARN(("Present->DmaSize(%d) < VBOXWDDM_DUMMY_DMABUFFER_SIZE (%d)", pPresent->DmaSize , VBOXWDDM_DUMMY_DMABUFFER_SIZE));
-        /** @todo can this actually happen? what status to return? */
-        return STATUS_INVALID_PARAMETER;
-    }
-
-#ifdef VBOX_WDDM_DUMP_REGIONS_ON_PRESENT
-    LogRel(("%s: [%ld, %ld, %ld, %ld] -> [%ld, %ld, %ld, %ld] (SubRectCnt=%u)\n",
-        pPresent->Flags.Blt ? "Blt" : (pPresent->Flags.Flip ? "Flip" : (pPresent->Flags.ColorFill ? "ColorFill" : "Unknown OP")),
-        pPresent->SrcRect.left, pPresent->SrcRect.top, pPresent->SrcRect.right, pPresent->SrcRect.bottom,
-        pPresent->DstRect.left, pPresent->DstRect.top, pPresent->DstRect.right, pPresent->DstRect.bottom,
-        pPresent->SubRectCnt));
-    for (unsigned int i = 0; i < pPresent->SubRectCnt; i++)
-        LogRel(("\tsub#%u = [%ld, %ld, %ld, %ld]\n", i, pPresent->pDstSubRects[i].left, pPresent->pDstSubRects[i].top, pPresent->pDstSubRects[i].right, pPresent->pDstSubRects[i].bottom));
-#endif
-
-    if (pPresent->Flags.Blt)
-    {
-        Assert(pPresent->Flags.Value == 1); /* only Blt is set, we do not support anything else for now */
-        DXGK_ALLOCATIONLIST *pSrc =  &pPresent->pAllocationList[DXGK_PRESENT_SOURCE_INDEX];
-        DXGK_ALLOCATIONLIST *pDst =  &pPresent->pAllocationList[DXGK_PRESENT_DESTINATION_INDEX];
-        PVBOXWDDM_ALLOCATION pSrcAlloc = vboxWddmGetAllocationFromAllocList(pSrc);
-        if (!pSrcAlloc)
-        {
-            /* this should not happen actually */
-            WARN(("failed to get Src Allocation info for hDeviceSpecificAllocation(0x%x)",pSrc->hDeviceSpecificAllocation));
-            return STATUS_INVALID_HANDLE;
-        }
-
-        PVBOXWDDM_ALLOCATION pDstAlloc = vboxWddmGetAllocationFromAllocList(pDst);
-        if (!pDstAlloc)
-        {
-            /* this should not happen actually */
-            WARN(("failed to get Dst Allocation info for hDeviceSpecificAllocation(0x%x)",pDst->hDeviceSpecificAllocation));
-            return STATUS_INVALID_HANDLE;
-        }
-
-        fPatchSrc = TRUE;
-        fPatchDst = TRUE;
-
-        BOOLEAN fDstPrimary = (!pDstAlloc->AllocData.hostID
-                && pDstAlloc->enmType == VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE
-                && pDstAlloc->bAssigned);
-        BOOLEAN fSrcPrimary = (!pSrcAlloc->AllocData.hostID
-                && pSrcAlloc->enmType == VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE
-                && pSrcAlloc->bAssigned);
-
-        pHdr->u8OpCode = VBOXCMDVBVA_OPTYPE_BLT;
-        pHdr->u8Flags = 0;
-
-        VBOXCMDVBVA_BLT_HDR *pBltHdr = (VBOXCMDVBVA_BLT_HDR*)pHdr;
-        pBltHdr->Pos.x = (int16_t)(pPresent->DstRect.left - pPresent->SrcRect.left);
-        pBltHdr->Pos.y = (int16_t)(pPresent->DstRect.top - pPresent->SrcRect.top);
-
-        if (pPresent->DmaBufferPrivateDataSize < VBOXCMDVBVA_SIZEOF_BLTSTRUCT_MAX)
-        {
-            WARN(("Present->DmaBufferPrivateDataSize(%d) < (%d)", pPresent->DmaBufferPrivateDataSize , VBOXCMDVBVA_SIZEOF_BLTSTRUCT_MAX));
-            /** @todo can this actually happen? what status to return? */
-            return STATUS_INVALID_PARAMETER;
-        }
-
-        if (pSrcAlloc->AllocData.hostID)
-        {
-            if (pDstAlloc->AllocData.hostID)
-            {
-                VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID *pBlt = (VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID*)pBltHdr;
-                pHdr->u8Flags |= VBOXCMDVBVA_OPF_BLT_TYPE_OFFPRIMSZFMT_OR_ID | VBOXCMDVBVA_OPF_OPERAND1_ISID | VBOXCMDVBVA_OPF_OPERAND2_ISID;
-                pBlt->id = pDstAlloc->AllocData.hostID;
-                pBlt->alloc.u.id = pSrcAlloc->AllocData.hostID;
-                cbPrivateData = RT_UOFFSETOF(VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID, aRects);
-            }
-            else
-            {
-                NTSTATUS Status = vboxWddmCmCmdBltIdNotIdFill(pBltHdr, pSrcAlloc, pDstAlloc, pDst, FALSE, &u32DstPatch, &cbPrivateData);
-                if (!NT_SUCCESS(Status))
-                {
-                    WARN(("vboxWddmCmCmdBltIdNotIdFill failed, %#x", Status));
-                    return Status;
-                }
-            }
-        }
-        else
-        {
-            if (pDstAlloc->AllocData.hostID)
-            {
-                NTSTATUS Status = vboxWddmCmCmdBltIdNotIdFill(pBltHdr, pDstAlloc, pSrcAlloc, pSrc, TRUE, &u32SrcPatch, &cbPrivateData);
-                if (!NT_SUCCESS(Status))
-                {
-                    WARN(("vboxWddmCmCmdBltIdNotIdFill failed, %#x", Status));
-                    return Status;
-                }
-            }
-            else
-            {
-                vboxWddmCmCmdBltNotIdNotIdFill(pBltHdr, pSrcAlloc, pSrc, pDstAlloc, pDst, &u32SrcPatch, &u32DstPatch, &cbPrivateData);
-            }
-        }
-
-        if (fDstPrimary)
-            pBltHdr->Hdr.u.u8PrimaryID = (uint8_t)pDstAlloc->AllocData.SurfDesc.VidPnSourceId;
-        else if (fSrcPrimary)
-        {
-            pBltHdr->Hdr.u8Flags |= VBOXCMDVBVA_OPF_PRIMARY_HINT_SRC;
-            pBltHdr->Hdr.u.u8PrimaryID = (uint8_t)pSrcAlloc->AllocData.SurfDesc.VidPnSourceId;
-        }
-        else
-            pBltHdr->Hdr.u.u8PrimaryID = 0xff;
-
-        paRects = (VBOXCMDVBVA_RECT*)(((uint8_t*)pPresent->pDmaBufferPrivateData) + cbPrivateData);
-        cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-    }
-    else if (pPresent->Flags.Flip)
-    {
-        if (pPresent->DmaBufferPrivateDataSize < sizeof (VBOXCMDVBVA_FLIP))
-        {
-            WARN(("Present->DmaBufferPrivateDataSize(%d) < sizeof VBOXCMDVBVA_FLIP (%d)", pPresent->DmaBufferPrivateDataSize , sizeof (VBOXCMDVBVA_FLIP)));
-            /** @todo can this actually happen? what status to return? */
-            return STATUS_INVALID_PARAMETER;
-        }
-
-        fPatchSrc = TRUE;
-
-        Assert(pPresent->Flags.Value == 4); /* only Blt is set, we do not support anything else for now */
-        Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D);
-        DXGK_ALLOCATIONLIST *pSrc =  &pPresent->pAllocationList[DXGK_PRESENT_SOURCE_INDEX];
-        PVBOXWDDM_ALLOCATION pSrcAlloc = vboxWddmGetAllocationFromAllocList(pSrc);
-
-        if (!pSrcAlloc)
-        {
-            /* this should not happen actually */
-            WARN(("failed to get pSrc Allocation info for hDeviceSpecificAllocation(0x%x)",pSrc->hDeviceSpecificAllocation));
-            return STATUS_INVALID_HANDLE;
-        }
-
-        Assert(pDevExt->cContexts3D);
-        pHdr->u8OpCode = VBOXCMDVBVA_OPTYPE_FLIP;
-        Assert((UINT)pSrcAlloc->AllocData.SurfDesc.VidPnSourceId < (UINT)VBoxCommonFromDeviceExt(pDevExt)->cDisplays);
-        pHdr->u.u8PrimaryID = pSrcAlloc->AllocData.SurfDesc.VidPnSourceId;
-        VBOXCMDVBVA_FLIP *pFlip = (VBOXCMDVBVA_FLIP*)pHdr;
-
-        if (pSrcAlloc->AllocData.hostID)
-        {
-            pHdr->u8Flags = VBOXCMDVBVA_OPF_OPERAND1_ISID;
-            pFlip->src.u.id = pSrcAlloc->AllocData.hostID;
-        }
-        else
-        {
-            WARN(("VBoxCVDdiFillAllocInfo reported no host id for flip!"));
-            pHdr->u8Flags = 0;
-            VBoxCVDdiFillAllocInfoOffVRAM(&pFlip->src, pSrc);
-            u32SrcPatch = RT_UOFFSETOF(VBOXCMDVBVA_FLIP, src.u.offVRAM);
-        }
-
-        cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-        paRects = pFlip->aRects;
-        cbPrivateData = VBOXCMDVBVA_SIZEOF_FLIPSTRUCT_MIN;
-    }
-    else if (pPresent->Flags.ColorFill)
-    {
-#ifdef DEBUG_misha
-        WARN(("test color fill!"));
-#endif
-
-        fPatchDst = TRUE;
-
-        Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D);
-        Assert(pPresent->Flags.Value == 2); /* only ColorFill is set, we do not support anything else for now */
-        DXGK_ALLOCATIONLIST *pDst =  &pPresent->pAllocationList[DXGK_PRESENT_DESTINATION_INDEX];
-        PVBOXWDDM_ALLOCATION pDstAlloc = vboxWddmGetAllocationFromAllocList(pDst);
-        if (!pDstAlloc)
-        {
-            /* this should not happen actually */
-            WARN(("failed to get pDst Allocation info for hDeviceSpecificAllocation(0x%x)",pDst->hDeviceSpecificAllocation));
-            return STATUS_INVALID_HANDLE;
-        }
-
-        if (pDstAlloc->AllocData.hostID)
-        {
-            WARN(("color fill present for texid not supported"));
-            pHdr->u8OpCode = VBOXCMDVBVA_OPTYPE_NOPCMD;
-            pHdr->u8Flags = 0;
-            pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-            cbPrivateData = sizeof (VBOXCMDVBVA_HDR);
-            cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-        }
-        else
-        {
-            BOOLEAN fDstPrimary = (!pDstAlloc->AllocData.hostID
-                    && pDstAlloc->enmType == VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE
-                    && pDstAlloc->bAssigned);
-
-            if (pPresent->DmaBufferPrivateDataSize < VBOXCMDVBVA_SIZEOF_CLRFILLSTRUCT_MAX)
-            {
-                WARN(("Present->DmaBufferPrivateDataSize(%d) < VBOXCMDVBVA_SIZEOF_CLRFILLSTRUCT_MAX (%d)", pPresent->DmaBufferPrivateDataSize , VBOXCMDVBVA_SIZEOF_CLRFILLSTRUCT_MAX));
-                /** @todo can this actually happen? what status to return? */
-                return STATUS_INVALID_PARAMETER;
-            }
-
-            VBOXCMDVBVA_CLRFILL_HDR *pClrFillHdr = (VBOXCMDVBVA_CLRFILL_HDR*)pHdr;
-
-            pClrFillHdr->Hdr.u8OpCode = VBOXCMDVBVA_OPTYPE_CLRFILL;
-            pClrFillHdr->u32Color = pPresent->Color;
-
-            pHdr->u8Flags = VBOXCMDVBVA_OPF_CLRFILL_TYPE_GENERIC_A8R8G8B8;
-            pHdr->u.u8PrimaryID = 0;
-
-            VBOXCMDVBVA_CLRFILL_GENERIC_A8R8G8B8 *pCFill = (VBOXCMDVBVA_CLRFILL_GENERIC_A8R8G8B8*)pHdr;
-            VBoxCVDdiFillAllocInfoOffVRAM(&pCFill->dst.Info, pDst);
-            pCFill->dst.u16Width = (uint16_t)pDstAlloc->AllocData.SurfDesc.width;
-            pCFill->dst.u16Height = (uint16_t)pDstAlloc->AllocData.SurfDesc.height;
-            u32DstPatch = RT_UOFFSETOF(VBOXCMDVBVA_CLRFILL_GENERIC_A8R8G8B8, dst.Info.u.offVRAM);
-            paRects = pCFill->aRects;
-            cbPrivateData = RT_UOFFSETOF(VBOXCMDVBVA_CLRFILL_GENERIC_A8R8G8B8, aRects);
-
-            if (fDstPrimary)
-                pCFill->Hdr.Hdr.u.u8PrimaryID = (uint8_t)pDstAlloc->AllocData.SurfDesc.VidPnSourceId;
-            else
-                pCFill->Hdr.Hdr.u.u8PrimaryID = 0xff;
-
-            cbBuffer = VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-        }
-    }
-    else
-    {
-        WARN(("cmd NOT IMPLEMENTED!! Flags(0x%x)", pPresent->Flags.Value));
-        return STATUS_NOT_SUPPORTED;
-    }
-
-    if (paRects)
-    {
-        uint32_t cbMaxRects = pPresent->DmaBufferPrivateDataSize - cbPrivateData;
-        UINT iStartRect = pPresent->MultipassOffset;
-        UINT cMaxRects = cbMaxRects / sizeof (VBOXCMDVBVA_RECT);
-        Assert(pPresent->SubRectCnt > iStartRect);
-        UINT cRects = pPresent->SubRectCnt - iStartRect;
-        if (cRects > cMaxRects)
-        {
-            pPresent->MultipassOffset += cMaxRects;
-            cRects = cMaxRects;
-        }
-        else
-            pPresent->MultipassOffset = 0;
-
-        Assert(cRects);
-        const RECT *paDstSubRects = &pPresent->pDstSubRects[iStartRect];
-        VBoxCVDdiPackRects(paRects, paDstSubRects, cRects);
-        cbPrivateData += (cRects * sizeof (VBOXCMDVBVA_RECT));
-    }
-
-    if (fPatchSrc)
-    {
-        memset(pPresent->pPatchLocationListOut, 0, sizeof (D3DDDI_PATCHLOCATIONLIST));
-        pPresent->pPatchLocationListOut->PatchOffset = u32SrcPatch;
-        pPresent->pPatchLocationListOut->AllocationIndex = DXGK_PRESENT_SOURCE_INDEX;
-        ++pPresent->pPatchLocationListOut;
-    }
-
-    if (fPatchDst)
-    {
-        memset(pPresent->pPatchLocationListOut, 0, sizeof (D3DDDI_PATCHLOCATIONLIST));
-        pPresent->pPatchLocationListOut->PatchOffset = u32DstPatch;
-        pPresent->pPatchLocationListOut->AllocationIndex = DXGK_PRESENT_DESTINATION_INDEX;
-        ++pPresent->pPatchLocationListOut;
-    }
-
-    pHdr->u8State = VBOXCMDVBVA_STATE_SUBMITTED;
-
-    pHdr->u2.complexCmdEl.u16CbCmdHost = cbPrivateData;
-    pHdr->u2.complexCmdEl.u16CbCmdGuest = cbBuffer;
-
-    Assert(cbBuffer);
-    Assert(cbPrivateData);
-    Assert(cbPrivateData >= sizeof (VBOXCMDVBVA_HDR));
-    pPresent->pDmaBuffer = ((uint8_t*)pPresent->pDmaBuffer) + cbBuffer;
-    pPresent->pDmaBufferPrivateData = ((uint8_t*)pPresent->pDmaBufferPrivateData) + cbPrivateData;
-
-    if (pPresent->MultipassOffset)
-        return STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-    return STATUS_SUCCESS;
-}
-#endif
-
-/**
- * DxgkDdiPresent
- */
-static NTSTATUS
-APIENTRY
-DxgkDdiPresentLegacy(
-    CONST HANDLE  hContext,
-    DXGKARG_PRESENT  *pPresent)
-{
-    RT_NOREF(hContext);
-    PAGED_CODE();
-
-//    LOGF(("ENTER, hContext(0x%x)", hContext));
-
-    vboxVDbgBreakFv();
-
-    NTSTATUS Status = STATUS_SUCCESS;
-#ifdef VBOX_STRICT
-    PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)hContext;
-    PVBOXWDDM_DEVICE pDevice = pContext->pDevice;
-    PVBOXMP_DEVEXT pDevExt = pDevice->pAdapter;
-#endif
-
-    Assert(pPresent->DmaBufferPrivateDataSize >= sizeof (VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR));
-    if (pPresent->DmaBufferPrivateDataSize < sizeof (VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR))
-    {
-        LOGREL(("Present->DmaBufferPrivateDataSize(%d) < sizeof VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR (%d)", pPresent->DmaBufferPrivateDataSize , sizeof (VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR)));
-        /** @todo can this actually happen? what status tu return? */
-        return STATUS_INVALID_PARAMETER;
-    }
-
-    PVBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR pPrivateData = (PVBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR)pPresent->pDmaBufferPrivateData;
-    pPrivateData->BaseHdr.fFlags.Value = 0;
-    /*uint32_t cContexts2D = ASMAtomicReadU32(&pDevExt->cContexts2D); - unused */
-
-    if (pPresent->Flags.Blt)
-    {
-        Assert(pPresent->Flags.Value == 1); /* only Blt is set, we do not support anything else for now */
-        DXGK_ALLOCATIONLIST *pSrc =  &pPresent->pAllocationList[DXGK_PRESENT_SOURCE_INDEX];
-        DXGK_ALLOCATIONLIST *pDst =  &pPresent->pAllocationList[DXGK_PRESENT_DESTINATION_INDEX];
-        PVBOXWDDM_ALLOCATION pSrcAlloc = vboxWddmGetAllocationFromAllocList(pSrc);
-        if (!pSrcAlloc)
-        {
-            /* this should not happen actually */
-            WARN(("failed to get Src Allocation info for hDeviceSpecificAllocation(0x%x)",pSrc->hDeviceSpecificAllocation));
-            Status = STATUS_INVALID_HANDLE;
-            goto done;
-        }
-
-        PVBOXWDDM_ALLOCATION pDstAlloc = vboxWddmGetAllocationFromAllocList(pDst);
-        if (!pDstAlloc)
-        {
-            /* this should not happen actually */
-            WARN(("failed to get Dst Allocation info for hDeviceSpecificAllocation(0x%x)",pDst->hDeviceSpecificAllocation));
-            Status = STATUS_INVALID_HANDLE;
-            goto done;
-        }
-
-
-        UINT cbCmd = pPresent->DmaBufferPrivateDataSize;
-        pPrivateData->BaseHdr.enmCmd = VBOXVDMACMD_TYPE_DMA_PRESENT_BLT;
-
-        PVBOXWDDM_DMA_PRIVATEDATA_BLT pBlt = (PVBOXWDDM_DMA_PRIVATEDATA_BLT)pPrivateData;
-
-        vboxWddmPopulateDmaAllocInfo(&pBlt->Blt.SrcAlloc, pSrcAlloc, pSrc);
-        vboxWddmPopulateDmaAllocInfo(&pBlt->Blt.DstAlloc, pDstAlloc, pDst);
-
-        ASSERT_WARN(!pSrcAlloc->fRcFlags.SharedResource, ("Shared Allocatoin used in Present!"));
-
-        pBlt->Blt.SrcRect = pPresent->SrcRect;
-        pBlt->Blt.DstRects.ContextRect = pPresent->DstRect;
-        pBlt->Blt.DstRects.UpdateRects.cRects = 0;
-        UINT cbHead = RT_UOFFSETOF(VBOXWDDM_DMA_PRIVATEDATA_BLT, Blt.DstRects.UpdateRects.aRects[0]);
-        Assert(pPresent->SubRectCnt > pPresent->MultipassOffset);
-        UINT cbRects = (pPresent->SubRectCnt - pPresent->MultipassOffset) * sizeof (RECT);
-        pPresent->pDmaBuffer = ((uint8_t*)pPresent->pDmaBuffer) + VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-        Assert(pPresent->DmaSize >= VBOXWDDM_DUMMY_DMABUFFER_SIZE);
-        cbCmd -= cbHead;
-        Assert(cbCmd < UINT32_MAX/2);
-        Assert(cbCmd > sizeof (RECT));
-        if (cbCmd >= cbRects)
-        {
-            cbCmd -= cbRects;
-            memcpy(&pBlt->Blt.DstRects.UpdateRects.aRects[0], &pPresent->pDstSubRects[pPresent->MultipassOffset], cbRects);
-            pBlt->Blt.DstRects.UpdateRects.cRects += cbRects/sizeof (RECT);
-
-            pPresent->pDmaBufferPrivateData = (uint8_t*)pPresent->pDmaBufferPrivateData + cbHead + cbRects;
-        }
-        else
-        {
-            UINT cbFitingRects = (cbCmd/sizeof (RECT)) * sizeof (RECT);
-            Assert(cbFitingRects);
-            memcpy(&pBlt->Blt.DstRects.UpdateRects.aRects[0], &pPresent->pDstSubRects[pPresent->MultipassOffset], cbFitingRects);
-            cbCmd -= cbFitingRects;
-            pPresent->MultipassOffset += cbFitingRects/sizeof (RECT);
-            pBlt->Blt.DstRects.UpdateRects.cRects += cbFitingRects/sizeof (RECT);
-            Assert(pPresent->SubRectCnt > pPresent->MultipassOffset);
-
-            pPresent->pDmaBufferPrivateData = (uint8_t*)pPresent->pDmaBufferPrivateData + cbHead + cbFitingRects;
-            Status = STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-        }
-
-        memset(pPresent->pPatchLocationListOut, 0, 2*sizeof (D3DDDI_PATCHLOCATIONLIST));
-        pPresent->pPatchLocationListOut->PatchOffset = 0;
-        pPresent->pPatchLocationListOut->AllocationIndex = DXGK_PRESENT_SOURCE_INDEX;
-        ++pPresent->pPatchLocationListOut;
-        pPresent->pPatchLocationListOut->PatchOffset = 4;
-        pPresent->pPatchLocationListOut->AllocationIndex = DXGK_PRESENT_DESTINATION_INDEX;
-        ++pPresent->pPatchLocationListOut;
-    }
-    else if (pPresent->Flags.Flip)
-    {
-        Assert(pPresent->Flags.Value == 4); /* only Blt is set, we do not support anything else for now */
-        Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D);
-        DXGK_ALLOCATIONLIST *pSrc =  &pPresent->pAllocationList[DXGK_PRESENT_SOURCE_INDEX];
-        PVBOXWDDM_ALLOCATION pSrcAlloc = vboxWddmGetAllocationFromAllocList(pSrc);
-
-        if (!pSrcAlloc)
-        {
-            /* this should not happen actually */
-            WARN(("failed to get pSrc Allocation info for hDeviceSpecificAllocation(0x%x)",pSrc->hDeviceSpecificAllocation));
-            Status = STATUS_INVALID_HANDLE;
-            goto done;
-        }
-
-        Assert(pDevExt->cContexts3D);
-        pPrivateData->BaseHdr.enmCmd = VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP;
-        PVBOXWDDM_DMA_PRIVATEDATA_FLIP pFlip = (PVBOXWDDM_DMA_PRIVATEDATA_FLIP)pPrivateData;
-
-        vboxWddmPopulateDmaAllocInfo(&pFlip->Flip.Alloc, pSrcAlloc, pSrc);
-
-        UINT cbCmd = sizeof (VBOXWDDM_DMA_PRIVATEDATA_FLIP);
-        pPresent->pDmaBufferPrivateData = (uint8_t*)pPresent->pDmaBufferPrivateData + cbCmd;
-        pPresent->pDmaBuffer = ((uint8_t*)pPresent->pDmaBuffer) + VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-        Assert(pPresent->DmaSize >= VBOXWDDM_DUMMY_DMABUFFER_SIZE);
-
-        memset(pPresent->pPatchLocationListOut, 0, sizeof (D3DDDI_PATCHLOCATIONLIST));
-        pPresent->pPatchLocationListOut->PatchOffset = 0;
-        pPresent->pPatchLocationListOut->AllocationIndex = DXGK_PRESENT_SOURCE_INDEX;
-        ++pPresent->pPatchLocationListOut;
-    }
-    else if (pPresent->Flags.ColorFill)
-    {
-        Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D);
-        Assert(pPresent->Flags.Value == 2); /* only ColorFill is set, we do not support anything else for now */
-        DXGK_ALLOCATIONLIST *pDst =  &pPresent->pAllocationList[DXGK_PRESENT_DESTINATION_INDEX];
-        PVBOXWDDM_ALLOCATION pDstAlloc = vboxWddmGetAllocationFromAllocList(pDst);
-        if (!pDstAlloc)
-        {
-
-            /* this should not happen actually */
-            WARN(("failed to get pDst Allocation info for hDeviceSpecificAllocation(0x%x)",pDst->hDeviceSpecificAllocation));
-            Status = STATUS_INVALID_HANDLE;
-            goto done;
-        }
-
-        UINT cbCmd = pPresent->DmaBufferPrivateDataSize;
-        pPrivateData->BaseHdr.enmCmd = VBOXVDMACMD_TYPE_DMA_PRESENT_CLRFILL;
-        PVBOXWDDM_DMA_PRIVATEDATA_CLRFILL pCF = (PVBOXWDDM_DMA_PRIVATEDATA_CLRFILL)pPrivateData;
-
-        vboxWddmPopulateDmaAllocInfo(&pCF->ClrFill.Alloc, pDstAlloc, pDst);
-
-        pCF->ClrFill.Color = pPresent->Color;
-        pCF->ClrFill.Rects.cRects = 0;
-        UINT cbHead = RT_UOFFSETOF(VBOXWDDM_DMA_PRIVATEDATA_CLRFILL, ClrFill.Rects.aRects[0]);
-        Assert(pPresent->SubRectCnt > pPresent->MultipassOffset);
-        UINT cbRects = (pPresent->SubRectCnt - pPresent->MultipassOffset) * sizeof (RECT);
-        pPresent->pDmaBuffer = ((uint8_t*)pPresent->pDmaBuffer) + VBOXWDDM_DUMMY_DMABUFFER_SIZE;
-        Assert(pPresent->DmaSize >= VBOXWDDM_DUMMY_DMABUFFER_SIZE);
-        cbCmd -= cbHead;
-        Assert(cbCmd < UINT32_MAX/2);
-        Assert(cbCmd > sizeof (RECT));
-        if (cbCmd >= cbRects)
-        {
-            cbCmd -= cbRects;
-            memcpy(&pCF->ClrFill.Rects.aRects[pPresent->MultipassOffset], pPresent->pDstSubRects, cbRects);
-            pCF->ClrFill.Rects.cRects += cbRects/sizeof (RECT);
-
-            pPresent->pDmaBufferPrivateData = (uint8_t*)pPresent->pDmaBufferPrivateData + cbHead + cbRects;
-        }
-        else
-        {
-            UINT cbFitingRects = (cbCmd/sizeof (RECT)) * sizeof (RECT);
-            Assert(cbFitingRects);
-            memcpy(&pCF->ClrFill.Rects.aRects[0], pPresent->pDstSubRects, cbFitingRects);
-            cbCmd -= cbFitingRects;
-            pPresent->MultipassOffset += cbFitingRects/sizeof (RECT);
-            pCF->ClrFill.Rects.cRects += cbFitingRects/sizeof (RECT);
-            Assert(pPresent->SubRectCnt > pPresent->MultipassOffset);
-
-            pPresent->pDmaBufferPrivateData = (uint8_t*)pPresent->pDmaBufferPrivateData + cbHead + cbFitingRects;
-            Status = STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
-        }
-
-        memset(pPresent->pPatchLocationListOut, 0, sizeof (D3DDDI_PATCHLOCATIONLIST));
-        pPresent->pPatchLocationListOut->PatchOffset = 0;
-        pPresent->pPatchLocationListOut->AllocationIndex = DXGK_PRESENT_DESTINATION_INDEX;
-        ++pPresent->pPatchLocationListOut;
-    }
-    else
-    {
-        WARN(("cmd NOT IMPLEMENTED!! Flags(0x%x)", pPresent->Flags.Value));
-        Status = STATUS_NOT_SUPPORTED;
-    }
-
-done:
-//    LOGF(("LEAVE, hContext(0x%x), Status(0x%x)", hContext, Status));
-
-    return Status;
 }
 
@@ -7159 +4725 @@
                     vboxWddmDisplaySettingsCheckPos(pDevExt, i);
                 }
-
-#ifdef VBOX_WITH_CROGL
-                if (!VBOXWDDM_IS_DISPLAYONLY() && pDevExt->f3DEnabled)
-                {
-                    VBoxMpCrPackerInit(&pContext->CrPacker);
-                    int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon, CR_PROTOCOL_VERSION_MAJOR, CR_PROTOCOL_VERSION_MINOR, &pContext->u32CrConClientID);
-                    if (!RT_SUCCESS(rc))
-                        WARN(("VBoxMpCrCtlConConnect failed rc (%d), ignoring for system context", rc));
-                }
-#endif
             }
             Status = STATUS_SUCCESS;
@@ -7182 +4738 @@
                 switch (pInfo->enmType)
                 {
-#ifdef VBOX_WITH_CROGL
-                    case VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D:
-                    {
-                        if (!pDevExt->fCmdVbvaEnabled)
-                        {
-                            Status = vboxVideoAMgrCtxCreate(&pDevExt->AllocMgr, &pContext->AllocContext);
-                            if (!NT_SUCCESS(Status))
-                                WARN(("vboxVideoAMgrCtxCreate failed %#x", Status));
-                        }
-                        else
-                            Status = STATUS_SUCCESS;
-
-                        if (Status == STATUS_SUCCESS)
-                        {
-                            Status = vboxWddmSwapchainCtxInit(pDevExt, pContext);
-                            AssertNtStatusSuccess(Status);
-                            if (Status == STATUS_SUCCESS)
-                            {
-                                pContext->enmType = VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D;
-                                Status = vboxVideoCmCtxAdd(&pDevice->pAdapter->CmMgr, &pContext->CmContext, (HANDLE)pInfo->u.vbox.hUmEvent, pInfo->u.vbox.u64UmInfo);
-                                AssertNtStatusSuccess(Status);
-                                if (Status == STATUS_SUCCESS)
-                                {
-                                    if (pInfo->u.vbox.crVersionMajor || pInfo->u.vbox.crVersionMinor)
-                                    {
-                                        if (pDevExt->f3DEnabled)
-                                        {
-                                            if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
-                                            {
-                                                int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon,
-                                                    pInfo->u.vbox.crVersionMajor, pInfo->u.vbox.crVersionMinor,
-                                                    &pContext->u32CrConClientID);
-                                                if (RT_SUCCESS(rc))
-                                                {
-                                                    VBoxMpCrPackerInit(&pContext->CrPacker);
-                                                }
-                                                else
-                                                {
-                                                    WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
-                                                    Status = STATUS_UNSUCCESSFUL;
-                                                }
-                                            }
-                                        }
-                                        else
-                                        {
-                                            LOG(("3D Not Enabled, failing 3D context creation"));
-                                            Status = STATUS_UNSUCCESSFUL;
-                                        }
-                                    }
-
-                                    if (NT_SUCCESS(Status))
-                                    {
-                                        ASMAtomicIncU32(&pDevExt->cContexts3D);
-                                        break;
-                                    }
-                                }
-
-                                vboxWddmSwapchainCtxTerm(pDevExt, pContext);
-                            }
-                            vboxVideoAMgrCtxDestroy(&pContext->AllocContext);
-                        }
-                        break;
-                    }
-                    case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_3D:
-                    case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL:
-                    {
-                        pContext->enmType = pInfo->enmType;
-                        if (!pDevExt->fCmdVbvaEnabled)
-                        {
-                            Status = vboxVideoAMgrCtxCreate(&pDevExt->AllocMgr, &pContext->AllocContext);
-                            if (!NT_SUCCESS(Status))
-                                WARN(("vboxVideoAMgrCtxCreate failed %#x", Status));
-                        }
-                        else
-                            Status = STATUS_SUCCESS;
-
-                        if (Status == STATUS_SUCCESS)
-                        {
-                            if (pInfo->u.vbox.crVersionMajor || pInfo->u.vbox.crVersionMinor)
-                            {
-                                if (pDevExt->f3DEnabled)
-                                {
-                                    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
-                                    {
-                                        int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon,
-                                            pInfo->u.vbox.crVersionMajor, pInfo->u.vbox.crVersionMinor,
-                                            &pContext->u32CrConClientID);
-                                        if (!RT_SUCCESS(rc))
-                                        {
-                                            WARN(("VBoxMpCrCtlConConnect failed rc (%d)", rc));
-                                            Status = STATUS_UNSUCCESSFUL;
-                                        }
-                                    }
-                                }
-                                else
-                                {
-                                    LOG(("3D Not Enabled, failing 3D (hgsmi) context creation"));
-                                    Status = STATUS_UNSUCCESSFUL;
-                                }
-                            }
-
-                            if (NT_SUCCESS(Status))
-                            {
-                                ASMAtomicIncU32(&pDevExt->cContexts3D);
-                                break;
-                            }
-                            vboxVideoAMgrCtxDestroy(&pContext->AllocContext);
-                        }
-                        break;
-                    }
-#endif
-                    case VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D:
-                    {
-                        pContext->enmType = pInfo->enmType;
-                        ASMAtomicIncU32(&pDevExt->cContexts2D);
-                        break;
-                    }
                     case VBOXWDDM_CONTEXT_TYPE_CUSTOM_DISPIF_RESIZE:
                     {
@@ -7370 +4809 @@
     switch(pContext->enmType)
     {
-        case VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D:
-        case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_3D:
-        case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL:
-        {
-            uint32_t cContexts = ASMAtomicDecU32(&pDevExt->cContexts3D);
-            Assert(cContexts < UINT32_MAX/2); NOREF(cContexts);
-            break;
-        }
-        case VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D:
-        {
-            uint32_t cContexts = ASMAtomicDecU32(&pDevExt->cContexts2D);
-            Assert(cContexts < UINT32_MAX/2); NOREF(cContexts);
-            break;
-        }
         case VBOXWDDM_CONTEXT_TYPE_CUSTOM_DISPIF_RESIZE:
         {
@@ -7417 +4842 @@
             break;
     }
-
-#ifdef VBOX_WITH_CROGL
-    if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX && pContext->u32CrConClientID)
-    {
-        VBoxMpCrCtlConDisconnect(pDevExt, &pDevExt->CrCtlCon, pContext->u32CrConClientID);
-    }
-#endif
-
-#ifdef VBOX_WITH_CROGL
-    /* first terminate the swapchain, this will also ensure
-     * all currently pending driver->user Cm commands
-     * (i.e. visible regions commands) are completed */
-    vboxWddmSwapchainCtxTerm(pDevExt, pContext);
-#endif
 
     Status = vboxVideoAMgrCtxDestroy(&pContext->AllocContext);
@@ -7773 +5184 @@
 }
 
-static NTSTATUS vboxWddmInitFullGraphicsDriver(IN PDRIVER_OBJECT pDriverObject, IN PUNICODE_STRING pRegistryPath, BOOLEAN fCmdVbva)
-{
-#ifdef VBOX_WITH_CROGL
-#define VBOXWDDM_CALLBACK_NAME(_base, _fCmdVbva) ((_fCmdVbva) ? _base##New : _base##Legacy)
-#else
-#define VBOXWDDM_CALLBACK_NAME(_base, _fCmdVbva) (_base##Legacy)
-#endif
-
+static NTSTATUS vboxWddmInitFullGraphicsDriver(IN PDRIVER_OBJECT pDriverObject, IN PUNICODE_STRING pRegistryPath)
+{
     DRIVER_INITIALIZATION_DATA DriverInitializationData = {'\0'};
 
@@ -7794 +5199 @@
     DriverInitializationData.DxgkDdiRemoveDevice = DxgkDdiRemoveDevice;
     DriverInitializationData.DxgkDdiDispatchIoRequest = DxgkDdiDispatchIoRequest;
-    DriverInitializationData.DxgkDdiInterruptRoutine = VBOXWDDM_CALLBACK_NAME(DxgkDdiInterruptRoutine, fCmdVbva);
-    DriverInitializationData.DxgkDdiDpcRoutine = VBOXWDDM_CALLBACK_NAME(DxgkDdiDpcRoutine, fCmdVbva);
+    DriverInitializationData.DxgkDdiInterruptRoutine          = GaDxgkDdiInterruptRoutine;
+    DriverInitializationData.DxgkDdiDpcRoutine                = GaDxgkDdiDpcRoutine;
     DriverInitializationData.DxgkDdiQueryChildRelations = DxgkDdiQueryChildRelations;
     DriverInitializationData.DxgkDdiQueryChildStatus = DxgkDdiQueryChildStatus;
@@ -7814 +5219 @@
     DriverInitializationData.DxgkDdiAcquireSwizzlingRange = DxgkDdiAcquireSwizzlingRange;
     DriverInitializationData.DxgkDdiReleaseSwizzlingRange = DxgkDdiReleaseSwizzlingRange;
-    DriverInitializationData.DxgkDdiPatch = VBOXWDDM_CALLBACK_NAME(DxgkDdiPatch, fCmdVbva);
-    DriverInitializationData.DxgkDdiSubmitCommand = VBOXWDDM_CALLBACK_NAME(DxgkDdiSubmitCommand, fCmdVbva);
-    DriverInitializationData.DxgkDdiPreemptCommand = VBOXWDDM_CALLBACK_NAME(DxgkDdiPreemptCommand, fCmdVbva);
-    DriverInitializationData.DxgkDdiBuildPagingBuffer = VBOXWDDM_CALLBACK_NAME(DxgkDdiBuildPagingBuffer, fCmdVbva);
+
+    DriverInitializationData.DxgkDdiPatch                     = GaDxgkDdiPatch;
+    DriverInitializationData.DxgkDdiSubmitCommand             = GaDxgkDdiSubmitCommand;
+    DriverInitializationData.DxgkDdiPreemptCommand            = GaDxgkDdiPreemptCommand;
+    DriverInitializationData.DxgkDdiBuildPagingBuffer         = GaDxgkDdiBuildPagingBuffer;
+
     DriverInitializationData.DxgkDdiSetPalette = DxgkDdiSetPalette;
     DriverInitializationData.DxgkDdiSetPointerPosition = DxgkDdiSetPointerPosition;
@@ -7825 +5232 @@
     DriverInitializationData.DxgkDdiEscape = DxgkDdiEscape;
     DriverInitializationData.DxgkDdiCollectDbgInfo = DxgkDdiCollectDbgInfo;
-    DriverInitializationData.DxgkDdiQueryCurrentFence = VBOXWDDM_CALLBACK_NAME(DxgkDdiQueryCurrentFence, fCmdVbva);
+    DriverInitializationData.DxgkDdiQueryCurrentFence         = GaDxgkDdiQueryCurrentFence;
     DriverInitializationData.DxgkDdiIsSupportedVidPn = DxgkDdiIsSupportedVidPn;
     DriverInitializationData.DxgkDdiRecommendFunctionalVidPn = DxgkDdiRecommendFunctionalVidPn;
@@ -7843 +5250 @@
     DriverInitializationData.DxgkDdiOpenAllocation = DxgkDdiOpenAllocation;
     DriverInitializationData.DxgkDdiCloseAllocation = DxgkDdiCloseAllocation;
-    DriverInitializationData.DxgkDdiRender = VBOXWDDM_CALLBACK_NAME(DxgkDdiRender, fCmdVbva);
-    DriverInitializationData.DxgkDdiPresent = VBOXWDDM_CALLBACK_NAME(DxgkDdiPresent, fCmdVbva);
+    DriverInitializationData.DxgkDdiRender                    = GaDxgkDdiRender;
+    DriverInitializationData.DxgkDdiPresent                   = GaDxgkDdiPresent;
 
     DriverInitializationData.DxgkDdiUpdateOverlay = DxgkDdiUpdateOverlay;
@@ -7967 +5374 @@
         }
 
-        BOOL fCmdVbva = FALSE;
         if (enmHwType == VBOXVIDEO_HWTYPE_VBOX)
         {
-            /* Try to establish connection to the host 3D service. */
-#ifdef VBOX_WITH_CROGL
-            VBoxMpCrCtlConInit();
-
-            /* always need to do the check to request host caps */
-            LOG(("Doing the 3D check.."));
-            f3DSupported = VBoxMpCrCtlConIs3DSupported();
-
-            fCmdVbva = RT_BOOL(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_CMDVBVA);
-#endif
+            /* No 3D for legacy adapter. */
+            f3DSupported = FALSE;
         }
         else if (enmHwType == VBOXVIDEO_HWTYPE_VMSVGA)
         {
-            fCmdVbva = TRUE;
+            /* Nothing. */
         }
         else
@@ -8031 +5429 @@
         if (NT_SUCCESS(Status))
         {
-#ifdef VBOX_WITH_CROGL
-            rc = VBoxVrInit();
-            if (RT_SUCCESS(rc))
-#endif
-            {
-                if (g_VBoxDisplayOnly)
-                {
-                    Status = vboxWddmInitDisplayOnlyDriver(DriverObject, RegistryPath);
-                }
-                else
-                {
-                    Status = vboxWddmInitFullGraphicsDriver(DriverObject, RegistryPath, fCmdVbva);
-                }
-
-                if (NT_SUCCESS(Status))
-                {
-                    /*
-                     * Successfully initialized the driver.
-                     */
-                    return Status;
-                }
-
+            if (g_VBoxDisplayOnly)
+            {
+                Status = vboxWddmInitDisplayOnlyDriver(DriverObject, RegistryPath);
+            }
+            else
+            {
+                Assert(enmHwType == VBOXVIDEO_HWTYPE_VMSVGA);
+                Status = vboxWddmInitFullGraphicsDriver(DriverObject, RegistryPath);
+            }
+
+            if (NT_SUCCESS(Status))
+            {
                 /*
-                 * Cleanup on failure.
+                 * Successfully initialized the driver.
                  */
-
-#ifdef VBOX_WITH_CROGL
-                VBoxVrTerm();
-#endif
-            }
-#ifdef VBOX_WITH_CROGL
-            else
-            {
-                WARN(("VBoxVrInit failed, rc(%d)", rc));
-                Status = STATUS_UNSUCCESSFUL;
-            }
-#endif
+                return Status;
+            }
+
+            /*
+             * Cleanup on failure.
+             */
         }
         else

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

@@ -194 +194 @@
 
 #ifdef VBOX_WITH_CROGL
-#define VBOXWDDMENTRY_2_SWAPCHAIN(_pE) ((PVBOXWDDM_SWAPCHAIN)((uint8_t*)(_pE) - RT_UOFFSETOF(VBOXWDDM_SWAPCHAIN, DevExtListEntry)))
-
 BOOLEAN DxgkDdiInterruptRoutineNew(
     IN CONST PVOID MiniportDeviceContext,

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

@@ -658 +658 @@
     DXGK_ALLOCATIONLIST *pSrc =  &pPresent->pAllocationList[DXGK_PRESENT_SOURCE_INDEX];
     DXGK_ALLOCATIONLIST *pDst =  &pPresent->pAllocationList[DXGK_PRESENT_DESTINATION_INDEX];
+
+#ifdef VBOX_WDDM_DUMP_REGIONS_ON_PRESENT
+    LogRel(("%s: [%ld, %ld, %ld, %ld] -> [%ld, %ld, %ld, %ld] (SubRectCnt=%u)\n",
+        pPresent->Flags.Blt ? "Blt" : (pPresent->Flags.Flip ? "Flip" : (pPresent->Flags.ColorFill ? "ColorFill" : "Unknown OP")),
+        pPresent->SrcRect.left, pPresent->SrcRect.top, pPresent->SrcRect.right, pPresent->SrcRect.bottom,
+        pPresent->DstRect.left, pPresent->DstRect.top, pPresent->DstRect.right, pPresent->DstRect.bottom,
+        pPresent->SubRectCnt));
+    for (unsigned int i = 0; i < pPresent->SubRectCnt; i++)
+        LogRel(("\tsub#%u = [%ld, %ld, %ld, %ld]\n", i, pPresent->pDstSubRects[i].left, pPresent->pDstSubRects[i].top, pPresent->pDstSubRects[i].right, pPresent->pDstSubRects[i].bottom));
+#endif
 
     if (pPresent->Flags.Blt)
@@ -1410 +1420 @@
     }
 
+    pDevExt->u.primary.DxgkInterface.DxgkCbQueueDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
+
     GALOG(("leave\n"));
     /* "Return TRUE as quickly as possible". */
@@ -1425 +1437 @@
     }
 
-    // pDevExt->u.primary.DxgkInterface.DxgkCbNotifyDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
+    pDevExt->u.primary.DxgkInterface.DxgkCbNotifyDpc(pDevExt->u.primary.DxgkInterface.DeviceHandle);
 
     /* Scan fence objects and mark all with u32FenceId < u32LastCompletedFenceId as SIGNALED */

trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

@@ -31 +31 @@
 # define VBOXESC_DBGPRINT                   0xABCD9005
 # define VBOXESC_SCREENLAYOUT               0xABCD9006
-# define VBOXESC_SWAPCHAININFO              0xABCD9007
-# define VBOXESC_UHGSMI_ALLOCATE            0xABCD9008
-# define VBOXESC_UHGSMI_DEALLOCATE          0xABCD9009
-# define VBOXESC_UHGSMI_SUBMIT              0xABCD900A
+// obsolete                                 0xABCD9007
+// obsolete                                 0xABCD9008
+// obsolete                                 0xABCD9009
+// obsolete                                 0xABCD900A
 # define VBOXESC_SHRC_ADDREF                0xABCD900B
 # define VBOXESC_SHRC_RELEASE               0xABCD900C
 # define VBOXESC_DBGDUMPBUF                 0xABCD900D
-# define VBOXESC_CRHGSMICTLCON_CALL         0xABCD900E
-# define VBOXESC_CRHGSMICTLCON_GETCLIENTID  0xABCD900F
+// obsolete                                 0xABCD900E
+// obsolete                                 0xABCD900F
 # define VBOXESC_REINITVIDEOMODESBYMASK     0xABCD9010
 # define VBOXESC_ADJUSTVIDEOMODES           0xABCD9011
-# define VBOXESC_SETCTXHOSTID               0xABCD9012
+// obsolete                                 0xABCD9012
 # define VBOXESC_CONFIGURETARGETS           0xABCD9013
 # define VBOXESC_SETALLOCHOSTID             0xABCD9014
-# define VBOXESC_CRHGSMICTLCON_GETHOSTCAPS  0xABCD9015
+// obsolete                                 0xABCD9015
 # define VBOXESC_UPDATEMODES                0xABCD9016
 # define VBOXESC_GUEST_DISPLAYCHANGED       0xABCD9017