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

Timestamp:

Feb 17, 2014 3:23:05 PM (11 years ago)

Author:

vboxsync

Message:

Build HGSMI memory allocator (unused)

Location:

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

Files:

• common/VBoxMPHGSMI.cpp (modified) (2 diffs)
• wddm/VBoxMPShgsmi.cpp (modified) (1 diff)
• wddm/VBoxMPShgsmi.h (modified) (1 diff)
• wddm/VBoxMPVdma.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.cpp

@@ -20 +20 @@
 #include "VBoxMPCommon.h"
 #include <VBox/VMMDev.h>
+#include <iprt/alloc.h>
+
+static DECLCALLBACK(void *) hgsmiEnvAlloc(void *pvEnv, HGSMISIZE cb)
+{
+    NOREF(pvEnv);
+    return RTMemAlloc(cb);
+}
+
+static DECLCALLBACK(void) hgsmiEnvFree(void *pvEnv, void *pv)
+{
+    NOREF(pvEnv);
+    RTMemFree(pv);
+}
+
+static HGSMIENV g_hgsmiEnvMP =
+{
+    NULL,
+    hgsmiEnvAlloc,
+    hgsmiEnvFree
+};
 
 /**
@@ -68 +88 @@
                                             cbGuestHeapMemory,
                                               offVRAMBaseMapping
-                                            + offGuestHeapMemory);
+                                            + offGuestHeapMemory,
+                                            &g_hgsmiEnvMP);
 
             if (RT_FAILURE(rc))

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

@@ -186 +186 @@
 }
 
-int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, bool fOffsetBased)
+int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, uint32_t u32HeapType, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase,
+                   const HGSMIENV *pEnv)
 {
     KeInitializeSpinLock(&pHeap->HeapLock);
-    return HGSMIHeapSetup(&pHeap->Heap, pvBase, cbArea, offBase, fOffsetBased);
+    return HGSMIHeapSetup(&pHeap->Heap, u32HeapType, pvBase, cbArea, offBase, pEnv);
 }
 

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

@@ -61 +61 @@
 }
 
-int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, bool fOffsetBased);
+int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, uint32_t u32HeapType, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, const HGSMIENV *pEnv);
 void VBoxSHGSMITerm(PVBOXSHGSMI pHeap);
 void* VBoxSHGSMIHeapAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData, uint8_t u8Channel, uint16_t u16ChannelInfo);

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

@@ -1451 +1451 @@
 #endif
 
+static DECLCALLBACK(void *) hgsmiEnvAlloc(void *pvEnv, HGSMISIZE cb)
+{
+    NOREF(pvEnv);
+    return RTMemAlloc(cb);
+}
+
+static DECLCALLBACK(void) hgsmiEnvFree(void *pvEnv, void *pv)
+{
+    NOREF(pvEnv);
+    RTMemFree(pv);
+}
+
+static HGSMIENV g_hgsmiEnvVdma =
+{
+    NULL,
+    hgsmiEnvAlloc,
+    hgsmiEnvFree
+};
+
 /* create a DMACommand buffer */
 int vboxVdmaCreate(PVBOXMP_DEVEXT pDevExt, VBOXVDMAINFO *pInfo
@@ -1486 +1505 @@
         /* Setup a HGSMI heap within the adapter information area. */
         rc = VBoxSHGSMIInit(&pInfo->CmdHeap,
+                             HGSMI_HEAP_TYPE_POINTER,
                              pvBuffer,
                              cbBuffer,
                              offBuffer,
-                             false /*fOffsetBased*/);
+                             &g_hgsmiEnvVdma);
         Assert(RT_SUCCESS(rc));
         if(RT_SUCCESS(rc))