Changeset 50482 in vbox for trunk/src/VBox/Additions/WINNT/Graphics
- Timestamp:
- Feb 17, 2014 3:23:05 PM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 92323
- Location:
- trunk/src/VBox/Additions/WINNT/Graphics/Video
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp
r37423 r50482 300 300 #endif /* VBOX_VBVA_ADJUST_RECT */ 301 301 302 static DECLCALLBACK(void *) hgsmiEnvAlloc(void *pvEnv, HGSMISIZE cb) 303 { 304 NOREF(pvEnv); 305 return EngAllocMem(0, cb, 0); 306 } 307 308 static DECLCALLBACK(void) hgsmiEnvFree(void *pvEnv, void *pv) 309 { 310 NOREF(pvEnv); 311 EngFreeMem(pv); 312 } 313 314 static HGSMIENV g_hgsmiEnvDisp = 315 { 316 NULL, 317 hgsmiEnvAlloc, 318 hgsmiEnvFree 319 }; 320 302 321 int VBoxDispVBVAInit(PVBOXDISPDEV pDev) 303 322 { … … 406 425 407 426 rc = HGSMIHeapSetup(&pDev->hgsmi.ctx.heapCtx, 427 HGSMI_HEAP_TYPE_POINTER, 408 428 (uint8_t *)pDev->memInfo.VideoRamBase+pDev->layout.offDisplayInfo+sizeof(HGSMIHOSTFLAGS), 409 429 pDev->layout.cbDisplayInfo-sizeof(HGSMIHOSTFLAGS), 410 430 info.areaDisplay.offBase+pDev->layout.offDisplayInfo+sizeof(HGSMIHOSTFLAGS), 411 false /*fOffsetBased*/);431 &g_hgsmiEnvDisp); 412 432 413 433 if (RT_SUCCESS(rc)) -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPHGSMI.cpp
r44529 r50482 20 20 #include "VBoxMPCommon.h" 21 21 #include <VBox/VMMDev.h> 22 #include <iprt/alloc.h> 23 24 static DECLCALLBACK(void *) hgsmiEnvAlloc(void *pvEnv, HGSMISIZE cb) 25 { 26 NOREF(pvEnv); 27 return RTMemAlloc(cb); 28 } 29 30 static DECLCALLBACK(void) hgsmiEnvFree(void *pvEnv, void *pv) 31 { 32 NOREF(pvEnv); 33 RTMemFree(pv); 34 } 35 36 static HGSMIENV g_hgsmiEnvMP = 37 { 38 NULL, 39 hgsmiEnvAlloc, 40 hgsmiEnvFree 41 }; 22 42 23 43 /** … … 68 88 cbGuestHeapMemory, 69 89 offVRAMBaseMapping 70 + offGuestHeapMemory); 90 + offGuestHeapMemory, 91 &g_hgsmiEnvMP); 71 92 72 93 if (RT_FAILURE(rc)) -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.cpp
r44529 r50482 186 186 } 187 187 188 int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, bool fOffsetBased) 188 int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, uint32_t u32HeapType, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, 189 const HGSMIENV *pEnv) 189 190 { 190 191 KeInitializeSpinLock(&pHeap->HeapLock); 191 return HGSMIHeapSetup(&pHeap->Heap, pvBase, cbArea, offBase, fOffsetBased);192 return HGSMIHeapSetup(&pHeap->Heap, u32HeapType, pvBase, cbArea, offBase, pEnv); 192 193 } 193 194 -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.h
r46757 r50482 61 61 } 62 62 63 int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, bool fOffsetBased);63 int VBoxSHGSMIInit(PVBOXSHGSMI pHeap, uint32_t u32HeapType, void *pvBase, HGSMISIZE cbArea, HGSMIOFFSET offBase, const HGSMIENV *pEnv); 64 64 void VBoxSHGSMITerm(PVBOXSHGSMI pHeap); 65 65 void* VBoxSHGSMIHeapAlloc(PVBOXSHGSMI pHeap, HGSMISIZE cbData, uint8_t u8Channel, uint16_t u16ChannelInfo); -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp
r49244 r50482 1451 1451 #endif 1452 1452 1453 static DECLCALLBACK(void *) hgsmiEnvAlloc(void *pvEnv, HGSMISIZE cb) 1454 { 1455 NOREF(pvEnv); 1456 return RTMemAlloc(cb); 1457 } 1458 1459 static DECLCALLBACK(void) hgsmiEnvFree(void *pvEnv, void *pv) 1460 { 1461 NOREF(pvEnv); 1462 RTMemFree(pv); 1463 } 1464 1465 static HGSMIENV g_hgsmiEnvVdma = 1466 { 1467 NULL, 1468 hgsmiEnvAlloc, 1469 hgsmiEnvFree 1470 }; 1471 1453 1472 /* create a DMACommand buffer */ 1454 1473 int vboxVdmaCreate(PVBOXMP_DEVEXT pDevExt, VBOXVDMAINFO *pInfo … … 1486 1505 /* Setup a HGSMI heap within the adapter information area. */ 1487 1506 rc = VBoxSHGSMIInit(&pInfo->CmdHeap, 1507 HGSMI_HEAP_TYPE_POINTER, 1488 1508 pvBuffer, 1489 1509 cbBuffer, 1490 1510 offBuffer, 1491 false /*fOffsetBased*/);1511 &g_hgsmiEnvVdma); 1492 1512 Assert(RT_SUCCESS(rc)); 1493 1513 if(RT_SUCCESS(rc))
Note:
See TracChangeset
for help on using the changeset viewer.