Changeset 41109 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

May 2, 2012 8:37:46 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL,wined3d,wddm: second part of fixing resource leakage, basics for cr commands submission from r0 miniport driver (for r0 visible region reporting, WPF 3D rendering fixes w/o Aero, etc.)

Location:

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

Files:

• disp/wddm/VBoxDispD3D.cpp (modified) (5 diffs)
• mp/Makefile.kmk (modified) (1 diff)
• mp/wddm/VBoxMPCr.cpp (modified) (1 diff)
• mp/wddm/VBoxMPShgsmi.cpp (modified) (1 diff)
• mp/wddm/VBoxMPShgsmi.h (modified) (1 diff)

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

@@ -2469 +2469 @@
     return hr;
 }
-
-static HRESULT vboxWddmShRcRefAlloc(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_ALLOCATION pAlloc, BOOL fAddRef, DWORD *pcRefs)
-{
-    D3DDDICB_ESCAPE DdiEscape = {0};
-    VBOXDISPIFESCAPE_SHRC_REF Data = {0};
-    DdiEscape.hContext = pDevice->DefaultContext.ContextInfo.hContext;
-    DdiEscape.hDevice = pDevice->hDevice;
-    DdiEscape.Flags.HardwareAccess = 1;
-    DdiEscape.pPrivateDriverData = &Data;
-    DdiEscape.PrivateDriverDataSize = sizeof (Data);
-    Data.EscapeHdr.escapeCode = fAddRef ? VBOXESC_SHRC_ADDREF : VBOXESC_SHRC_RELEASE;
-    Data.hAlloc = (uint64_t)pAlloc->hAllocation;
-    HRESULT hr = pDevice->RtCallbacks.pfnEscapeCb(pDevice->pAdapter->hAdapter, &DdiEscape);
-    if (FAILED(hr))
-    {
-        WARN(("pfnEscapeCb, hr (0x%x)", hr));
-        return TRUE;
-    }
-
-    LOG(("shrc(0x%p) refs(%d)", (void*)pAlloc->hSharedHandle, Data.EscapeHdr.u32CmdSpecific));
-    if (pcRefs)
-        *pcRefs = Data.EscapeHdr.u32CmdSpecific;
-
-    return hr;
-}
-
-static HRESULT vboxWddmShRcRefRc(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_RESOURCE pRc, BOOL fAddRef, DWORD *pcRefs)
-{
-    Assert(pRc->RcDesc.fFlags.SharedResource);
-    DWORD cTotalRefs = 0;
-    HRESULT hr = S_OK;
-    for (DWORD i = 0; i < pRc->cAllocations; ++i)
-    {
-        DWORD cRefs = 0;
-        PVBOXWDDMDISP_ALLOCATION pAlloc = &pRc->aAllocations[i];
-        if(!pAlloc->hSharedHandle)
-            continue;
-
-        hr = vboxWddmShRcRefAlloc(pDevice, pAlloc, fAddRef, &cRefs);
-
-        if (FAILED(hr))
-        {
-            WARN(("vboxWddmShRcRefAlloc failed, hr()0x%x", hr));
-            for (DWORD j = 0; j < i; ++j)
-            {
-                PVBOXWDDMDISP_ALLOCATION pAlloc = &pRc->aAllocations[i];
-                if(!pAlloc->hSharedHandle)
-                    continue;
-                HRESULT tmpHr = vboxWddmShRcRefAlloc(pDevice, pAlloc, !fAddRef, NULL);
-                Assert(SUCCEEDED(tmpHr));
-            }
-            return hr;
-        }
-
-        /* success! */
-        cTotalRefs += cRefs;
-    }
-
-    Assert(cTotalRefs || !fAddRef);
-
-    /* success! */
-    if (pcRefs)
-        *pcRefs = cTotalRefs;
-
-    return S_OK;
-}
-
 
 static HRESULT vboxWddmSwapchainChkCreateIf(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_SWAPCHAIN pSwapchain)
@@ -5681 +5614 @@
                     if (pResource->Flags.SharedResource)
                     {
-                        if (pAllocation->hSharedHandle)
-                        {
-                            vboxWddmShRcRefAlloc(pDevice, pAllocation, TRUE, NULL);
-                        }
 #ifdef DEBUG_misha
                         Assert(VBOXWDDMDISP_IS_TEXTURE(pResource->Flags));
@@ -5747 +5676 @@
         for (UINT i = 0; i < pRc->cAllocations; ++i)
         {
-            BOOL fSetDelete = FALSE;
             PVBOXWDDMDISP_ALLOCATION pAlloc = &pRc->aAllocations[i];
             if (pAlloc->hSharedHandle)
             {
-                /* using one and the same shared resource by different clients could lead to the situation where one client can still refer to the resource
-                 * while another one has deleted it
-                 * this could lead to gl state corruption on both host and guest side.
-                 * This is why we take extra care to avoid it.
-                 * Until we do a vboxWddmShRcRefAlloc call below the resource is guarantied to be present, however it can be removed any time after the call
-                 * if cShRcRefs is non-zero, i.e. the current cliet is not the one deleting it.
-                 * We first explicitely say to wine that resource must NOT be accessed any more and that all references to it should be cleaned */
-                pAdapter->D3D.pfnVBoxWineExD3DRc9SetShRcState((IDirect3DResource9*)pAlloc->pD3DIf, VBOXWINEEX_SHRC_STATE_GL_DISABLE);
-
-                DWORD cShRcRefs;
-                HRESULT tmpHr = vboxWddmShRcRefAlloc(pDevice, pAlloc, FALSE, &cShRcRefs);
-                if (!cShRcRefs)
-                {
-                    /* the current client IS the one deleting this resource */
-                    fSetDelete = TRUE;
-                }
 #ifdef DEBUG_misha
                 vboxVDbgPrint(("\n\n********\n(0x%x:0n%d)Shared DESTROYED pAlloc(0x%p), hRc(0x%p), hAl(0x%p), "
@@ -5775 +5687 @@
                             ));
 #endif
-            }
-
-            if (fSetDelete)
-            {
-                Assert(pAlloc->pD3DIf);
-                pAdapter->D3D.pfnVBoxWineExD3DRc9SetShRcState((IDirect3DResource9*)pAlloc->pD3DIf, VBOXWINEEX_SHRC_STATE_GL_DELETE);
             }
 
@@ -7091 +6997 @@
                     Assert(pAllocation->hSharedHandle);
 #endif
-
-                    vboxWddmShRcRefAlloc(pDevice, pAllocation, TRUE, NULL);
-
                     vboxVDbgPrint(("\n\n********\n(0x%x:0n%d)Shared OPENNED pAlloc(0x%p), hRc(0x%p), hAl(0x%p), "
                                     "Handle(0x%x), (0n%d) \n***********\n\n",

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

@@ -87 +87 @@
  endif
  VBoxVideoWddm_DEFS       += LOG_TO_BACKDOOR
- VBoxVideoWddm_INCS       += ../../../include .. . ../../../../common/VBoxGuestLib $(VBOX_PATH_CROGL_INCLUDE)
+ VBoxVideoWddm_INCS       += ../../../include .. . ../../../../common/VBoxGuestLib $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
  VBoxVideoWddm_LDFLAGS.x86 += /Entry:DriverEntry@8
  VBoxVideoWddm_LDFLAGS.amd64 += /Entry:DriverEntry

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

@@ -20 +20 @@
 #include "VBoxMPCr.h"
 
+#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+
 #include <cr_protocol.h>
 
-#include <VBox/HostServices/VBoxCrOpenGLSvc.h>
+#if 0
+#include <cr_pack.h>
+
+typedef struct PVBOXMP_SHGSMIPACKER
+{
+    PVBOXMP_DEVEXT pDevExt;
+    CRPackContext CrPacker;
+    CRPackBuffer CrBuffer;
+} PVBOXMP_SHGSMIPACKER, *PPVBOXMP_SHGSMIPACKER;
+
+static void* vboxMpCrShgsmiBufferAlloc(PVBOXMP_DEVEXT pDevExt, HGSMISIZE cbData)
+{
+    return VBoxSHGSMIHeapBufferAlloc(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, cbData);
+}
+
+static void vboxMpCrShgsmiBufferFree(PVBOXMP_DEVEXT pDevExt, void *pvBuffer)
+{
+    VBoxSHGSMIHeapBufferFree(&VBoxCommonFromDeviceExt(pDevExt)->guestCtx.heapCtx, pvBuffer);
+}
+
+static void vboxMpCrShgsmiPackerCbFlush(void *pvFlush)
+{
+    PPVBOXMP_SHGSMIPACKER pPacker = (PPVBOXMP_SHGSMIPACKER)pvFlush;
+
+    crPackReleaseBuffer(&pPacker->CrPacker);
+
+    if (pPacker->CrBuffer.opcode_current != pPacker->CrBuffer.opcode_start)
+    {
+        CRMessageOpcodes *pHdr;
+        unsigned int len;
+        pHdr = vboxMpCrPackerPrependHeader(&pPacker->CrBuffer, &len, 0);
+
+        /*Send*/
+    }
+
+
+    crPackSetBuffer(&pPacker->CrPacker, &pPacker->CrBuffer);
+    crPackResetPointers(&pPacker->CrPacker);
+}
+
+static int vboxMpCrShgsmiPackerInit(PPVBOXMP_SHGSMIPACKER pPacker, PVBOXMP_DEVEXT pDevExt)
+{
+    memset(pPacker, 0, sizeof (*pPacker));
+
+    static const cbBuffer = 1000;
+    void *pvBuffer = vboxMpCrShgsmiBufferAlloc(pDevExt, cbBuffer);
+    if (!pvBuffer)
+    {
+        WARN(("vboxMpCrShgsmiBufferAlloc failed"));
+        return VERR_NO_MEMORY;
+    }
+    crPackInitBuffer(&pPacker->CrBuffer, pvBuffer, cbBuffer, cbBuffer);
+    crPackSetBuffer(&pPacker->CrPacker, &pPacker->CrBuffer);
+    crPackFlushFunc(&pPacker->CrPacker, vboxMpCrShgsmiPackerCbFlush);
+    crPackFlushArg(&pPacker->CrPacker, pPacker);
+//    crPackSendHugeFunc( thread->packer, packspuHuge );
+    return VINF_SUCCESS;
+}
+#endif
 
 static int vboxMpCrCtlAddRef(PVBOXMP_CRCTLCON pCrCtlCon)

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

@@ -161 +161 @@
     KeAcquireSpinLock(&pHeap->HeapLock, &OldIrql);
     HGSMIHeapFree(&pHeap->Heap, pvBuffer);
+    KeReleaseSpinLock(&pHeap->HeapLock, OldIrql);
+}
+
+void* VBoxSHGSMIHeapBufferAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData)
+{
+    KIRQL OldIrql;
+    void* pvData;
+    Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+    KeAcquireSpinLock(&pHeap->HeapLock, &OldIrql);
+    pvData = HGSMIHeapBufferAlloc(&pHeap->Heap, cbData);
+    KeReleaseSpinLock(&pHeap->HeapLock, OldIrql);
+    if (!pvData)
+        WARN(("HGSMIHeapAlloc failed!"));
+    return pvData;
+}
+
+void VBoxSHGSMIHeapBufferFree(PVBOXSHGSMI pHeap, void *pvBuffer)
+{
+    KIRQL OldIrql;
+    Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+    KeAcquireSpinLock(&pHeap->HeapLock, &OldIrql);
+    HGSMIHeapBufferFree(&pHeap->Heap, pvBuffer);
     KeReleaseSpinLock(&pHeap->HeapLock, OldIrql);
 }

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

@@ -58 +58 @@
 void* VBoxSHGSMIHeapAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData, uint8_t u8Channel, uint16_t u16ChannelInfo);
 void VBoxSHGSMIHeapFree(PVBOXSHGSMI pHeap, void *pvBuffer);
+void* VBoxSHGSMIHeapBufferAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData);
+void VBoxSHGSMIHeapBufferFree(PVBOXSHGSMI pHeap, void *pvBuffer);
 void* VBoxSHGSMICommandAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData, uint8_t u8Channel, uint16_t u16ChannelInfo);
 void VBoxSHGSMICommandFree(PVBOXSHGSMI pHeap, void *pvBuffer);