Changeset 32107 in vbox

Timestamp:

Aug 31, 2010 6:50:53 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: issue render cmd on flush for shared resources to notify d3d runtime about surf contents change (not completed)

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp (modified) (5 diffs)
• src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.h (modified) (3 diffs)
• src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp (modified) (3 diffs)

trunk/include/VBox/VBoxVideo.h

@@ -1180 +1180 @@
     VBOXVDMACMD_TYPE_DMA_PRESENT_SHADOW2PRIMARY,
     VBOXVDMACMD_TYPE_DMA_PRESENT_CLRFILL,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP
+    VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP,
+    VBOXVDMACMD_TYPE_DMA_NOP
 } VBOXVDMACMD_TYPE;
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -4011 +4011 @@
             if (pAlloc->pSecondaryOpenedD3DIf)
                 pAlloc->pSecondaryOpenedD3DIf->Release();
+
+            EnterCriticalSection(&pDevice->DirtyAllocListLock);
+            if (pAlloc->DirtyAllocListEntry.pNext)
+                RTListNodeRemove(&pAlloc->DirtyAllocListEntry);
+            LeaveCriticalSection(&pDevice->DirtyAllocListLock);
         }
     }
@@ -4182 +4187 @@
     return hr;
 }
+
+typedef struct VBOXWDDMDISP_NSCADD
+{
+    VOID* pvCommandBuffer;
+    UINT cbCommandBuffer;
+    D3DDDI_ALLOCATIONLIST* pAllocationList;
+    UINT cAllocationList;
+    D3DDDI_PATCHLOCATIONLIST* pPatchLocationList;
+    UINT cPatchLocationList;
+    UINT cAllocations;
+}VBOXWDDMDISP_NSCADD, *PVBOXWDDMDISP_NSCADD;
+
+static HRESULT vboxWddmNSCAddAlloc(PVBOXWDDMDISP_NSCADD pData, PVBOXWDDMDISP_ALLOCATION pAlloc, BOOL bWrite)
+{
+    HRESULT hr = S_OK;
+    if (pData->cAllocationList && pData->cPatchLocationList && pData->cbCommandBuffer > 4)
+    {
+        memset(pData->pAllocationList, 0, sizeof (D3DDDI_ALLOCATIONLIST));
+        pData->pAllocationList[0].hAllocation = pAlloc->hAllocation;
+        if (bWrite)
+            pData->pAllocationList[0].WriteOperation = 1;
+
+        memset(pData->pPatchLocationList, 0, sizeof (D3DDDI_PATCHLOCATIONLIST));
+        pData->pPatchLocationList[0].PatchOffset = pData->cAllocations*4;
+        pData->pPatchLocationList[0].AllocationIndex = pData->cAllocations;
+
+        pData->cbCommandBuffer -= 4;
+        --pData->cAllocationList;
+        --pData->cPatchLocationList;
+        ++pData->cAllocations;
+    }
+    else
+        hr = S_FALSE;
+
+    ++pData->pAllocationList;
+    ++pData->pPatchLocationList;
+    pData->pvCommandBuffer = (VOID*)(((uint8_t*)pData->pvCommandBuffer) + 4);
+
+    return hr;
+}
+
+static HRESULT vboxWddmNotifySharedChange(PVBOXWDDMDISP_DEVICE pDevice)
+{
+    VBOXWDDMDISP_NSCADD NscAdd;
+
+    do
+    {
+        NscAdd.pvCommandBuffer = pDevice->DefaultContext.ContextInfo.pCommandBuffer;
+        NscAdd.cbCommandBuffer = pDevice->DefaultContext.ContextInfo.CommandBufferSize;
+        NscAdd.pAllocationList = pDevice->DefaultContext.ContextInfo.pAllocationList;
+        NscAdd.cAllocationList = pDevice->DefaultContext.ContextInfo.AllocationListSize;
+        NscAdd.pPatchLocationList = pDevice->DefaultContext.ContextInfo.pPatchLocationList;
+        NscAdd.cPatchLocationList = pDevice->DefaultContext.ContextInfo.PatchLocationListSize;
+        NscAdd.cAllocations = 0;
+
+        EnterCriticalSection(&pDevice->DirtyAllocListLock);
+
+        PVBOXWDDMDISP_ALLOCATION pAlloc = RTListNodeGetFirst(&pDevice->DirtyAllocList, VBOXWDDMDISP_ALLOCATION, DirtyAllocListEntry);
+        if (pAlloc)
+        {
+            HRESULT tmpHr = vboxWddmNSCAddAlloc(&NscAdd, pAlloc, TRUE);
+            Assert(tmpHr == S_OK || tmpHr == S_FALSE);
+            if (tmpHr == S_OK)
+            {
+                RTListNodeRemove(&pAlloc->DirtyAllocListEntry);
+                LeaveCriticalSection(&pDevice->DirtyAllocListLock);
+                continue;
+            }
+
+            LeaveCriticalSection(&pDevice->DirtyAllocListLock);
+
+        }
+        else
+        {
+            LeaveCriticalSection(&pDevice->DirtyAllocListLock);
+            if (!NscAdd.cAllocations)
+                break;
+        }
+
+        D3DDDICB_RENDER RenderData = {0};
+        RenderData.CommandLength = pDevice->DefaultContext.ContextInfo.CommandBufferSize - NscAdd.cbCommandBuffer;
+        Assert(RenderData.CommandLength);
+        Assert(RenderData.CommandLength < UINT32_MAX/2);
+        RenderData.CommandOffset = 0;
+        RenderData.NumAllocations = pDevice->DefaultContext.ContextInfo.AllocationListSize - NscAdd.cAllocationList;
+        Assert(RenderData.NumAllocations == NscAdd.cAllocations);
+        RenderData.NumPatchLocations = pDevice->DefaultContext.ContextInfo.PatchLocationListSize - NscAdd.cPatchLocationList;
+        Assert(RenderData.NumPatchLocations == NscAdd.cAllocations);
+        RenderData.NewCommandBufferSize = sizeof (VBOXVDMACMD) + 4 * (100);
+        RenderData.NewAllocationListSize = 100;
+        RenderData.NewPatchLocationListSize = 100;
+        RenderData.hContext = pDevice->DefaultContext.ContextInfo.hContext;
+
+        HRESULT hr = pDevice->RtCallbacks.pfnRenderCb(pDevice->hDevice, &RenderData);
+        Assert(hr == S_OK);
+        if (hr == S_OK)
+        {
+            pDevice->DefaultContext.ContextInfo.CommandBufferSize = RenderData.NewCommandBufferSize;
+            pDevice->DefaultContext.ContextInfo.pCommandBuffer = RenderData.pNewCommandBuffer;
+            pDevice->DefaultContext.ContextInfo.AllocationListSize = RenderData.NewAllocationListSize;
+            pDevice->DefaultContext.ContextInfo.pAllocationList = RenderData.pNewAllocationList;
+            pDevice->DefaultContext.ContextInfo.PatchLocationListSize = RenderData.NewPatchLocationListSize;
+            pDevice->DefaultContext.ContextInfo.pPatchLocationList = RenderData.pNewPatchLocationList;
+        }
+        else
+            break;
+    } while (1);
+
+    return S_OK;
+}
+
 static HRESULT APIENTRY vboxWddmDDevFlush(HANDLE hDevice)
 {
@@ -4210 +4326 @@
             }
         }
+
+        vboxWddmNotifySharedChange(pDevice);
     }
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p), hr(0x%x)\n", hDevice, hr));
@@ -4815 +4933 @@
 #endif
 
+    if (pDstRc->RcDesc.fFlags.SharedResource)
+    {
+        PVBOXWDDMDISP_ALLOCATION pAlloc = &pDstRc->aAllocations[pData->DstSubResourceIndex];
+        EnterCriticalSection(&pDevice->DirtyAllocListLock);
+        if (!pAlloc->DirtyAllocListEntry.pNext)
+            RTListAppend(&pDevice->DirtyAllocList, &pAlloc->DirtyAllocListEntry);
+        LeaveCriticalSection(&pDevice->DirtyAllocListLock);
+    }
+
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p), hr(0x%x)\n", hDevice, hr));
     return hr;
@@ -5581 +5708 @@
         pDevice->ViewPort.MinZ = 0.;
         pDevice->ViewPort.MaxZ = 1.;
+
+        InitializeCriticalSection(&pDevice->DirtyAllocListLock);
+        RTListInit(&pDevice->DirtyAllocList);
 
         Assert(!pCreateData->AllocationListSize);

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.h

@@ -95 +95 @@
     IDirect3DDevice9 *pDevice9If;
     struct VBOXWDDMDISP_RESOURCE *pRenderTargetRc;
+    struct VBOXWDDMDISP_RESOURCE *pDstSharedRc;
     uint32_t iRenderTargetFrontBuf;
     HWND hWnd;
@@ -124 +125 @@
     D3DVIEWPORT9 ViewPort;
     VBOXWDDMDISP_CONTEXT DefaultContext;
+
+    CRITICAL_SECTION DirtyAllocListLock;
+    RTLISTNODE DirtyAllocList;
 
     UINT iPrimaryScreen;
@@ -160 +164 @@
     IUnknown *pSecondaryOpenedD3DIf;
     VBOXDISP_D3DIFTYPE enmD3DIfType;
+    RTLISTNODE DirtyAllocListEntry;
     HANDLE hSharedHandle;
     VBOXWDDMDISP_LOCKINFO LockInfo;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -1954 +1954 @@
                 break;
             }
+            case VBOXVDMACMD_TYPE_DMA_NOP:
+                break;
             default:
             {
@@ -2310 +2312 @@
             break;
         }
+        case VBOXVDMACMD_TYPE_DMA_NOP:
+        {
+            PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pSubmitCommand->hContext;
+            Assert(pContext);
+            Status = vboxWddmDmaCmdNotifyCompletion(pDevExt, pContext, pSubmitCommand->SubmissionFenceId);
+            Assert(Status == STATUS_SUCCESS);
+            break;
+        }
         default:
         {
@@ -3779 +3789 @@
     drprintf(("==> "__FUNCTION__ ", !!NOT_IMPLEMENTED!! hContext(0x%x)\n", hContext));
 
+    pRender->pDmaBuffer = ((uint8_t*)pRender->pDmaBuffer) + pRender->CommandLength;
+    /* @todo: impl  */
     AssertBreakpoint();