Changeset 49332 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm

Timestamp:

Oct 30, 2013 1:13:02 PM (11 years ago)

Author:

vboxsync

Message:

wddm: 1. switch to using common VBVA code 2.dx-based command submission - work in progress 3.some prototyping for getting 3D data for video recording/take snapshot

Location:

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

Files:

• VBoxUhgsmiBase.cpp (modified) (4 diffs)
• VBoxUhgsmiBase.h (modified) (8 diffs)
• VBoxUhgsmiDisp.cpp (modified) (9 diffs)
• VBoxUhgsmiDisp.h (modified) (1 diff)
• VBoxUhgsmiKmt.cpp (modified) (2 diffs)

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

@@ -33 +33 @@
 int vboxUhgsmiBaseBufferTerm(PVBOXUHGSMI_BUFFER_PRIVATE_ESC_BASE pBuffer)
 {
-    PVBOXUHGSMI_PRIVATE_BASE pPrivate = VBOXUHGSMIBASE_GET(pBuffer->PrivateBase.pHgsmi);
+    PVBOXUHGSMI_PRIVATE_BASE pPrivate = VBOXUHGSMIBASE_GET(pBuffer->BasePrivate.pHgsmi);
     VBOXDISPIFESCAPE_UHGSMI_DEALLOCATE DeallocInfo = {0};
     DeallocInfo.EscapeHdr.escapeCode = VBOXESC_UHGSMI_DEALLOCATE;
@@ -98 +98 @@
     pBuffer->Alloc = AllocInfo.Alloc;
     Assert(pBuffer->Alloc.pvData);
-    pBuffer->PrivateBase.pHgsmi = pPrivate;
-    pBuffer->PrivateBase.Base.pfnLock = vboxUhgsmiBaseEscBufferLock;
-    pBuffer->PrivateBase.Base.pfnUnlock = vboxUhgsmiBaseEscBufferUnlock;
-    pBuffer->PrivateBase.Base.pfnDestroy = pfnDestroy;
-    pBuffer->PrivateBase.Base.fType = fUhgsmiType;
-    pBuffer->PrivateBase.Base.cbBuffer = AllocInfo.Alloc.cbData;
+    pBuffer->BasePrivate.pHgsmi = pPrivate;
+    pBuffer->BasePrivate.Base.pfnLock = vboxUhgsmiBaseEscBufferLock;
+    pBuffer->BasePrivate.Base.pfnUnlock = vboxUhgsmiBaseEscBufferUnlock;
+    pBuffer->BasePrivate.Base.pfnDestroy = pfnDestroy;
+    pBuffer->BasePrivate.Base.fType = fUhgsmiType;
+    pBuffer->BasePrivate.Base.cbBuffer = AllocInfo.Alloc.cbData;
     pBuffer->hSynch = hSynch;
     return VINF_SUCCESS;
@@ -137 +137 @@
     if (RT_SUCCESS(rc))
     {
-        *ppBuf = &pBuffer->PrivateBase.Base;
+        *ppBuf = &pBuffer->BasePrivate.Base;
         return VINF_SUCCESS;
     }
@@ -182 +182 @@
         {
             pSubmInfo->Info.offData = 0;
-            pSubmInfo->Info.cbData = pBuf->PrivateBase.Base.cbBuffer;
+            pSubmInfo->Info.cbData = pBuf->BasePrivate.Base.cbBuffer;
         }
         else

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.h

@@ -68 +68 @@
 typedef struct VBOXUHGSMI_BUFFER_PRIVATE_ESC_BASE
 {
-    VBOXUHGSMI_BUFFER_PRIVATE_BASE PrivateBase;
+    VBOXUHGSMI_BUFFER_PRIVATE_BASE BasePrivate;
     VBOXVIDEOCM_UM_ALLOC Alloc;
     HANDLE hSynch;
@@ -75 +75 @@
 typedef struct VBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE
 {
-    VBOXUHGSMI_BUFFER_PRIVATE_BASE PrivateBase;
+    VBOXUHGSMI_BUFFER_PRIVATE_BASE BasePrivate;
     D3DKMT_HANDLE hAllocation;
     UINT aLockPageIndices[1];
@@ -84 +84 @@
 #define VBOXUHGSMIBASE_GET_BUFFER(_p) VBOXUHGSMIBASE_GET_PRIVATE(_p, VBOXUHGSMI_BUFFER_PRIVATE_BASE)
 
-#define VBOXUHGSMIPRIVATEBASE_GET_PRIVATE(_p, _t) ((_t*)(((uint8_t*)_p) - RT_OFFSETOF(_t, PrivateBase.Base)))
+#define VBOXUHGSMIPRIVATEBASE_GET_PRIVATE(_p, _t) ((_t*)(((uint8_t*)_p) - RT_OFFSETOF(_t, BasePrivate.Base)))
 #define VBOXUHGSMIESCBASE_GET_BUFFER(_p) VBOXUHGSMIPRIVATEBASE_GET_PRIVATE(_p, VBOXUHGSMI_BUFFER_PRIVATE_ESC_BASE)
 #define VBOXUHGSMDXALLOCBASE_GET_BUFFER(_p) VBOXUHGSMIPRIVATEBASE_GET_PRIVATE(_p, VBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE)
 
-DECLINLINE(int) vboxUhgsmiBaseLockData(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags,
-                                    D3DDDICB_LOCKFLAGS *pfFlags, UINT *pNumPages, UINT* pPages)
-{
+DECLINLINE(int) vboxUhgsmiBaseDxLockData(PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pPrivate, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags,
+                                    D3DDDICB_LOCKFLAGS *pfFlags, UINT *pNumPages)
+{
+    PVBOXUHGSMI_BUFFER pBuf = &pPrivate->BasePrivate.Base;
     D3DDDICB_LOCKFLAGS fLockFlags;
     fLockFlags.Value = 0;
@@ -127 +128 @@
             for (UINT i = 0, j = iFirstPage; i < cPages; ++i, ++j)
             {
-                pPages[i] = j;
+                pPrivate->aLockPageIndices[i] = j;
             }
         }
@@ -141 +142 @@
 }
 
-#if 0
-DECLINLINE(int) vboxUhgsmiBaseDmaFill(PVBOXUHGSMI_BUFFER_SUBMIT aBuffers, uint32_t cBuffers,
+DECLINLINE(int) vboxUhgsmiBaseDxDmaFill(PVBOXUHGSMI_BUFFER_SUBMIT aBuffers, uint32_t cBuffers,
         VOID* pCommandBuffer, UINT *pCommandBufferSize,
         D3DDDI_ALLOCATIONLIST *pAllocationList, UINT AllocationListSize,
@@ -170 +170 @@
     {
         PVBOXUHGSMI_BUFFER_SUBMIT pBufInfo = &aBuffers[i];
-        PVBOXUHGSMI_BUFFER_PRIVATE_BASE pBuffer = VBOXUHGSMIBASE_GET_BUFFER(pBufInfo->pBuf);
+        PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pBuffer = VBOXUHGSMDXALLOCBASE_GET_BUFFER(pBufInfo->pBuf);
 
         memset(pAllocationList, 0, sizeof (D3DDDI_ALLOCATIONLIST));
@@ -181 +181 @@
         {
             pBufSubmInfo->offData = 0;
-            pBufSubmInfo->cbData = pBuffer->Base.cbBuffer;
+            pBufSubmInfo->cbData = pBuffer->BasePrivate.Base.cbBuffer;
         }
         else
@@ -195 +195 @@
     return VINF_SUCCESS;
 }
-#endif
 
 DECLCALLBACK(int) vboxUhgsmiBaseEscBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock);

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

@@ -22 +22 @@
 #define VBOXUHGSMID3D_GET(_p) VBOXUHGSMID3D_GET_PRIVATE(_p, VBOXUHGSMI_PRIVATE_D3D)
 
-#if 0
-#define VBOXUHGSMID3D_GET_BUFFER(_p) VBOXUHGSMID3D_GET_PRIVATE(_p, VBOXUHGSMI_BUFFER_PRIVATE_D3D)
-
 #include <iprt/mem.h>
 #include <iprt/err.h>
 
-typedef struct VBOXUHGSMI_BUFFER_PRIVATE_D3D
-{
-    VBOXUHGSMI_BUFFER_PRIVATE_BASE BasePrivate;
-    PVBOXWDDMDISP_DEVICE pDevice;
-    UINT aLockPageIndices[1];
-} VBOXUHGSMI_BUFFER_PRIVATE_D3D, *PVBOXUHGSMI_BUFFER_PRIVATE_D3D;
-
-
-
 DECLCALLBACK(int) vboxUhgsmiD3DBufferDestroy(PVBOXUHGSMI_BUFFER pBuf)
 {
-    PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuffer = VBOXUHGSMID3D_GET_BUFFER(pBuf);
+    PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pBuffer = VBOXUHGSMDXALLOCBASE_GET_BUFFER(pBuf);
+    struct VBOXWDDMDISP_DEVICE *pDevice = VBOXUHGSMID3D_GET(pBuffer->BasePrivate.pHgsmi)->pDevice;
     D3DDDICB_DEALLOCATE DdiDealloc;
     DdiDealloc.hResource = 0;
     DdiDealloc.NumAllocations = 1;
-    DdiDealloc.HandleList = &pBuffer->BasePrivate.hAllocation;
-    HRESULT hr = pBuffer->pDevice->RtCallbacks.pfnDeallocateCb(pBuffer->pDevice->hDevice, &DdiDealloc);
-    Assert(hr == S_OK);
-    if (hr == S_OK)
-    {
-        if (pBuffer->BasePrivate.hSynch)
-            CloseHandle(pBuffer->BasePrivate.hSynch);
+    DdiDealloc.HandleList = &pBuffer->hAllocation;
+    HRESULT hr = pDevice->RtCallbacks.pfnDeallocateCb(pDevice->hDevice, &DdiDealloc);
+    if (hr == S_OK)
+    {
         RTMemFree(pBuffer);
         return VINF_SUCCESS;
     }
-    return VERR_GENERAL_FAILURE;
-}
-
+
+    WARN(("pfnDeallocateCb failed, hr %#x", hr));
+    return VERR_GENERAL_FAILURE;
+}
+
+/* typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_LOCK(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock); */
 DECLCALLBACK(int) vboxUhgsmiD3DBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock)
 {
-    PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuffer = VBOXUHGSMID3D_GET_BUFFER(pBuf);
+    PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pBuffer = VBOXUHGSMDXALLOCBASE_GET_BUFFER(pBuf);
+    struct VBOXWDDMDISP_DEVICE *pDevice = VBOXUHGSMID3D_GET(pBuffer->BasePrivate.pHgsmi)->pDevice;
     D3DDDICB_LOCK DdiLock = {0};
-    DdiLock.hAllocation = pBuffer->BasePrivate.hAllocation;
+    DdiLock.hAllocation = pBuffer->hAllocation;
     DdiLock.PrivateDriverData = 0;
 
-    int rc = vboxUhgsmiBaseLockData(pBuf, offLock, cbLock, fFlags,
-                                         &DdiLock.Flags, &DdiLock.NumPages, pBuffer->aLockPageIndices);
-    AssertRC(rc);
-    if (RT_FAILURE(rc))
+    int rc = vboxUhgsmiBaseDxLockData(pBuffer, offLock, cbLock, fFlags,
+                                         &DdiLock.Flags, &DdiLock.NumPages);
+    if (!RT_SUCCESS(rc))
+    {
+        WARN(("vboxUhgsmiBaseDxLockData failed rc %d", rc));
         return rc;
+    }
 
     if (DdiLock.NumPages)
@@ -74 +66 @@
         DdiLock.pPages = NULL;
 
-    HRESULT hr = pBuffer->pDevice->RtCallbacks.pfnLockCb(pBuffer->pDevice->hDevice, &DdiLock);
-    Assert(hr == S_OK);
+    HRESULT hr = pDevice->RtCallbacks.pfnLockCb(pDevice->hDevice, &DdiLock);
     if (hr == S_OK)
     {
@@ -81 +72 @@
         return VINF_SUCCESS;
     }
+
+    WARN(("pfnLockCb failed, hr %#x", hr));
     return VERR_GENERAL_FAILURE;
 }
@@ -86 +79 @@
 DECLCALLBACK(int) vboxUhgsmiD3DBufferUnlock(PVBOXUHGSMI_BUFFER pBuf)
 {
-    PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuffer = VBOXUHGSMID3D_GET_BUFFER(pBuf);
+    PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pBuffer = VBOXUHGSMDXALLOCBASE_GET_BUFFER(pBuf);
+    struct VBOXWDDMDISP_DEVICE *pDevice = VBOXUHGSMID3D_GET(pBuffer->BasePrivate.pHgsmi)->pDevice;
     D3DDDICB_UNLOCK DdiUnlock;
     DdiUnlock.NumAllocations = 1;
-    DdiUnlock.phAllocations = &pBuffer->BasePrivate.hAllocation;
-    HRESULT hr = pBuffer->pDevice->RtCallbacks.pfnUnlockCb(pBuffer->pDevice->hDevice, &DdiUnlock);
-    Assert(hr == S_OK);
-    if (hr == S_OK)
-        return VINF_SUCCESS;
-    return VERR_GENERAL_FAILURE;
-}
-
-DECLCALLBACK(int) vboxUhgsmiD3DBufferCreate(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fUhgsmiType, PVBOXUHGSMI_BUFFER* ppBuf)
-{
-    HANDLE hSynch = NULL;
+    DdiUnlock.phAllocations = &pBuffer->hAllocation;
+    HRESULT hr = pDevice->RtCallbacks.pfnUnlockCb(pDevice->hDevice, &DdiUnlock);
+    if (hr == S_OK)
+        return VINF_SUCCESS;
+
+    WARN(("pfnUnlockCb failed, hr %#x", hr));
+    return VERR_GENERAL_FAILURE;
+}
+
+/*typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_CREATE(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fType, PVBOXUHGSMI_BUFFER* ppBuf);*/
+DECLCALLBACK(int) vboxUhgsmiD3DBufferCreate(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fType, PVBOXUHGSMI_BUFFER* ppBuf)
+{
     if (!cbBuf)
         return VERR_INVALID_PARAMETER;
 
-    int rc = vboxUhgsmiBaseEventChkCreate(fUhgsmiType, &hSynch);
-    AssertRC(rc);
-    if (RT_FAILURE(rc))
-        return rc;
+    int rc = VINF_SUCCESS;
 
     cbBuf = VBOXWDDM_ROUNDBOUND(cbBuf, 0x1000);
@@ -114 +106 @@
 
     PVBOXUHGSMI_PRIVATE_D3D pPrivate = VBOXUHGSMID3D_GET(pHgsmi);
-    PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuf = (PVBOXUHGSMI_BUFFER_PRIVATE_D3D)RTMemAllocZ(RT_OFFSETOF(VBOXUHGSMI_BUFFER_PRIVATE_D3D, aLockPageIndices[cPages]));
-    Assert(pBuf);
+    PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pBuf = (PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE)RTMemAllocZ(RT_OFFSETOF(VBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE, aLockPageIndices[cPages]));
     if (pBuf)
     {
-        struct
-        {
-            D3DDDICB_ALLOCATE DdiAlloc;
-            D3DDDI_ALLOCATIONINFO DdiAllocInfo;
-            VBOXWDDM_ALLOCINFO AllocInfo;
-        } Buf;
-        memset(&Buf, 0, sizeof (Buf));
-        Buf.DdiAlloc.hResource = NULL;
-        Buf.DdiAlloc.hKMResource = NULL;
-        Buf.DdiAlloc.NumAllocations = 1;
-        Buf.DdiAlloc.pAllocationInfo = &Buf.DdiAllocInfo;
-        Buf.DdiAllocInfo.pPrivateDriverData = &Buf.AllocInfo;
-        Buf.DdiAllocInfo.PrivateDriverDataSize = sizeof (Buf.AllocInfo);
-        Buf.AllocInfo.enmType = VBOXWDDM_ALLOC_TYPE_UMD_HGSMI_BUFFER;
-        Buf.AllocInfo.cbBuffer = cbBuf;
-        Buf.AllocInfo.hSynch = hSynch;
-        Buf.AllocInfo.fUhgsmiType = fUhgsmiType;
-
-        HRESULT hr = pPrivate->pDevice->RtCallbacks.pfnAllocateCb(pPrivate->pDevice->hDevice, &Buf.DdiAlloc);
-        Assert(hr == S_OK);
+        D3DDDICB_ALLOCATE DdiAlloc;
+        D3DDDI_ALLOCATIONINFO DdiAllocInfo;
+        VBOXWDDM_ALLOCINFO AllocInfo;
+
+        memset(&DdiAlloc, 0, sizeof (DdiAlloc));
+        DdiAlloc.hResource = NULL;
+        DdiAlloc.hKMResource = NULL;
+        DdiAlloc.NumAllocations = 1;
+        DdiAlloc.pAllocationInfo = &DdiAllocInfo;
+        DdiAllocInfo.pPrivateDriverData = &AllocInfo;
+        DdiAllocInfo.PrivateDriverDataSize = sizeof (AllocInfo);
+        AllocInfo.enmType = VBOXWDDM_ALLOC_TYPE_UMD_HGSMI_BUFFER;
+        AllocInfo.cbBuffer = cbBuf;
+        AllocInfo.hSynch = 0;
+        AllocInfo.fUhgsmiType = fType;
+
+        HRESULT hr = pPrivate->pDevice->RtCallbacks.pfnAllocateCb(pPrivate->pDevice->hDevice, &DdiAlloc);
         if (hr == S_OK)
         {
-            Assert(Buf.DdiAllocInfo.hAllocation);
+            Assert(DdiAllocInfo.hAllocation);
             pBuf->BasePrivate.Base.pfnLock = vboxUhgsmiD3DBufferLock;
             pBuf->BasePrivate.Base.pfnUnlock = vboxUhgsmiD3DBufferUnlock;
-//            pBuf->Base.pfnAdjustValidDataRange = vboxUhgsmiD3DBufferAdjustValidDataRange;
             pBuf->BasePrivate.Base.pfnDestroy = vboxUhgsmiD3DBufferDestroy;
 
-            pBuf->BasePrivate.Base.fType = fUhgsmiType;
+            pBuf->BasePrivate.Base.fType = fType;
             pBuf->BasePrivate.Base.cbBuffer = cbBuf;
 
-            pBuf->pDevice = pPrivate->pDevice;
-            pBuf->BasePrivate.hAllocation = Buf.DdiAllocInfo.hAllocation;
+            pBuf->hAllocation = DdiAllocInfo.hAllocation;
 
             *ppBuf = &pBuf->BasePrivate.Base;
@@ -156 +142 @@
             return VINF_SUCCESS;
         }
+        else
+        {
+            WARN(("pfnAllocateCb failed hr %#x"));
+            rc = VERR_GENERAL_FAILURE;
+        }
 
         RTMemFree(pBuf);
     }
     else
+    {
+        WARN(("RTMemAllocZ failed"));
         rc = VERR_NO_MEMORY;
-
-    if (hSynch)
-        CloseHandle(hSynch);
+    }
 
     return rc;
 }
 
+/* typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_SUBMIT(PVBOXUHGSMI pHgsmi, PVBOXUHGSMI_BUFFER_SUBMIT aBuffers, uint32_t cBuffers); */
 DECLCALLBACK(int) vboxUhgsmiD3DBufferSubmit(PVBOXUHGSMI pHgsmi, PVBOXUHGSMI_BUFFER_SUBMIT aBuffers, uint32_t cBuffers)
 {
@@ -173 +165 @@
     PVBOXWDDMDISP_DEVICE pDevice = pHg->pDevice;
     UINT cbDmaCmd = pDevice->DefaultContext.ContextInfo.CommandBufferSize;
-    int rc = vboxUhgsmiBaseDmaFill(aBuffers, cBuffers,
+    int rc = vboxUhgsmiBaseDxDmaFill(aBuffers, cBuffers,
             pDevice->DefaultContext.ContextInfo.pCommandBuffer, &cbDmaCmd,
             pDevice->DefaultContext.ContextInfo.pAllocationList, pDevice->DefaultContext.ContextInfo.AllocationListSize,
             pDevice->DefaultContext.ContextInfo.pPatchLocationList, pDevice->DefaultContext.ContextInfo.PatchLocationListSize);
-    AssertRC(rc);
     if (RT_FAILURE(rc))
+    {
+        WARN(("vboxUhgsmiBaseDxDmaFill failed, rc %d", rc));
         return rc;
+    }
 
     D3DDDICB_RENDER DdiRender = {0};
@@ -194 +188 @@
 
     HRESULT hr = pDevice->RtCallbacks.pfnRenderCb(pDevice->hDevice, &DdiRender);
-    Assert(hr == S_OK);
     if (hr == S_OK)
     {
@@ -207 +200 @@
     }
 
-    return VERR_GENERAL_FAILURE;
-}
-
-HRESULT vboxUhgsmiD3DInit(PVBOXUHGSMI_PRIVATE_D3D pHgsmi, PVBOXWDDMDISP_DEVICE pDevice)
+    WARN(("pfnRenderCb failed, hr %#x", hr));
+    return VERR_GENERAL_FAILURE;
+}
+
+void vboxUhgsmiD3DInit(PVBOXUHGSMI_PRIVATE_D3D pHgsmi, PVBOXWDDMDISP_DEVICE pDevice)
 {
     pHgsmi->BasePrivate.Base.pfnBufferCreate = vboxUhgsmiD3DBufferCreate;
     pHgsmi->BasePrivate.Base.pfnBufferSubmit = vboxUhgsmiD3DBufferSubmit;
+    /* no escapes (for now) */
+    pHgsmi->BasePrivate.pfnEscape = NULL;
     pHgsmi->pDevice = pDevice;
-    return S_OK;
-}
-#endif
+}
 
 static DECLCALLBACK(int) vboxCrHhgsmiDispEscape(struct VBOXUHGSMI_PRIVATE_BASE *pHgsmi, void *pvData, uint32_t cbData, BOOL fHwAccess)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiDisp.h

@@ -29 +29 @@
 } VBOXUHGSMI_PRIVATE_D3D, *PVBOXUHGSMI_PRIVATE_D3D;
 
-#if 0
 void vboxUhgsmiD3DInit(PVBOXUHGSMI_PRIVATE_D3D pHgsmi, struct VBOXWDDMDISP_DEVICE *pDevice);
-#endif
 
 void vboxUhgsmiD3DEscInit(PVBOXUHGSMI_PRIVATE_D3D pHgsmi, struct VBOXWDDMDISP_DEVICE *pDevice);

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

@@ -71 +71 @@
     EnterCriticalSection(&pBuffer->CritSect);
 
-    int rc = vboxUhgsmiBaseLockData(pBuf, offLock, cbLock, fFlags,
-                                         &DdiLock.Flags, &DdiLock.NumPages, pBuffer->aLockPageIndices);
+    int rc = vboxUhgsmiBaseDxLockData(&pBuffer->BasePrivate, offLock, cbLock, fFlags,
+                                         &DdiLock.Flags, &DdiLock.NumPages);
     AssertRC(rc);
     if (RT_FAILURE(rc))
@@ -194 +194 @@
     PVBOXUHGSMI_PRIVATE_KMT pHg = VBOXUHGSMIKMT_GET(pHgsmi);
     UINT cbDmaCmd = pHg->Context.CommandBufferSize;
-    int rc = vboxUhgsmiBaseDmaFill(aBuffers, cBuffers,
+    int rc = vboxUhgsmiBaseDxDmaFill(aBuffers, cBuffers,
             pHg->Context.pCommandBuffer, &cbDmaCmd,
             pHg->Context.pAllocationList, pHg->Context.AllocationListSize,