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

Timestamp:

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

Author:

vboxsync

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

77709

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/mp/wddm

Files:

• VBoxMPCr.cpp (modified) (1 diff)
• VBoxMPShgsmi.cpp (modified) (1 diff)
• VBoxMPShgsmi.h (modified) (1 diff)

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);