Changeset 25062 in vbox for trunk/include/VBox/HGSMI

Timestamp:

Nov 27, 2009 7:24:14 PM (15 years ago)

Author:

vboxsync

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

55413

Message:

HGSMI,DevVGA: Use the offset based heap for the hostHeap (resides in VRAM). New staved state version for DevVGA for indicating this change.

File:

• trunk/include/VBox/HGSMI/HGSMI.h (modified) (3 diffs)

trunk/include/VBox/HGSMI/HGSMI.h

@@ -153 +153 @@
 typedef struct _HGSMIHEAP
 {
-    RTHEAPSIMPLE  heap;            /* Heap instance. */
-    HGSMIAREA     area;            /* Description. */
-    int           cRefs;           /* Number of heap allocations. */
+    union
+    {
+        RTHEAPSIMPLE  hPtr;         /**< Pointer based heap. */
+        RTHEAPOFFSET  hOff;         /**< Offset based heap. */
+    } u;
+    HGSMIAREA     area;             /**< Description. */
+    int           cRefs;            /**< Number of heap allocations. */
+    bool          fOffsetBased;     /**< Set if offset based. */
 } HGSMIHEAP;
 #pragma pack()
@@ -262 +267 @@
                     void *pvBase,
                     HGSMISIZE cbArea,
-                    HGSMIOFFSET offBase);
+                    HGSMIOFFSET offBase,
+                    bool fOffsetBased);
 
 int HGSMIHeapRelocate (HGSMIHEAP *pHeap,
-                    void *pvBase,
-                    uint32_t offHeapHandle,
-                    uintptr_t offDelta,
-                    HGSMISIZE cbArea,
-                    HGSMIOFFSET offBase
-                    );
+                       void *pvBase,
+                       uint32_t offHeapHandle,
+                       uintptr_t offDelta,
+                       HGSMISIZE cbArea,
+                       HGSMIOFFSET offBase,
+                       bool fOffsetBased);
 
 void HGSMIHeapSetupUnitialized (HGSMIHEAP *pHeap);
@@ -296 +302 @@
 DECLINLINE(HGSMIOFFSET) HGSMIHeapHandleLocationOffset(HGSMIHEAP *pHeap)
 {
-    return pHeap->heap != NIL_RTHEAPSIMPLE ? (uint32_t)(pHeap->area.pu8Base - (uint8_t*)pHeap->heap) : HGSMIOFFSET_VOID;
+    AssertCompile((uintptr_t)NIL_RTHEAPSIMPLE == (uintptr_t)NIL_RTHEAPOFFSET);
+    return pHeap->u.hPtr != NIL_RTHEAPSIMPLE
+        ? (HGSMIOFFSET)(pHeap->area.pu8Base - (uint8_t*)pHeap->u.hPtr)
+        : HGSMIOFFSET_VOID;
 }