Changeset 29883 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.h

Timestamp:

May 30, 2010 7:27:02 PM (15 years ago)

Author:

vboxsync

Message:

wddm: open,create,destroy,lock,unlock resource

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.h

@@ -44 +44 @@
 #endif
 
-#define VBOXWDDM_ROUNDBOUND(_v, _b) (((_v) + ((_b) - 1)) & ~((_b) - 1))
-
 PVOID vboxWddmMemAlloc(IN SIZE_T cbSize);
 PVOID vboxWddmMemAllocZero(IN SIZE_T cbSize);
 VOID vboxWddmMemFree(PVOID pvMem);
-
-typedef struct VBOXWDDM_ALLOCINFO_SHAREDPRIMARYSURFACE
-{
-    D3DDDI_RATIONAL                 RefreshRate;
-    D3DDDI_VIDEO_PRESENT_SOURCE_ID  VidPnSourceId;
-} VBOXWDDM_ALLOCINFO_SHAREDPRIMARYSURFACE, *PVBOXWDDM_ALLOCINFO_SHAREDPRIMARYSURFACE;
 
 /* allocation */
@@ -62 +54 @@
     UINT SegmentId;
     VBOXVIDEOOFFSET offVram;
-    union
-    {
-        VBOXWDDM_SURFACE_DESC SurfInfo;
-    } u;
+    BOOLEAN bVisible;
+    BOOLEAN bAssigned;
+    VBOXWDDM_SURFACE_DESC SurfDesc;
 } VBOXWDDM_ALLOCATION, *PVBOXWDDM_ALLOCATION;
 
-#define VBOXWDDM_ALLOCATION_HEADSIZE() (sizeof (VBOXWDDM_ALLOCATION))
-#define VBOXWDDM_ALLOCATION_SIZE_FROMBODYSIZE(_s) (VBOXWDDM_ALLOCATION_HEADSIZE() + (_s))
-#define VBOXWDDM_ALLOCATION_SIZE(_tCmd) (VBOXWDDM_ALLOCATION_SIZE_FROMBODYSIZE(sizeof(_tCmd)))
-#define VBOXWDDM_ALLOCATION_BODY(_p, _t) ( (_t*)(((uint8_t*)(_p)) + VBOXWDDM_ALLOCATION_HEADSIZE()) )
-#define VBOXWDDM_ALLOCATION_HEAD(_pb) ((VBOXWDDM_ALLOCATION*)((uint8_t *)(_pb) - VBOXWDDM_ALLOCATION_HEADSIZE()))
-
-
-typedef struct VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE
+typedef struct VBOXWDDM_RESOURCE
 {
+    VBOXWDDM_ALLOC_TYPE enmType;
+    UINT SegmentId;
+    VBOXVIDEOOFFSET offVram;
     D3DDDI_RATIONAL RefreshRate;
     D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId;
-//    VBOXVIDEOOFFSET offAddress;
     BOOLEAN bVisible;
     BOOLEAN bAssigned;
-} VBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE, *PVBOXWDDM_ALLOCATION_SHAREDPRIMARYSURFACE;
+    VBOXWDDM_SURFACE_DESC SurfDesc;
+    uint32_t cAllocations;
+} VBOXWDDM_RESOURCE, *PVBOXWDDM_RESOURCE;
 
-#ifdef VBOXWDDM_RENDER_FROM_SHADOW
-typedef struct VBOXWDDM_ALLOCATION_SHADOWSURFACE
-{
-    D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId;
-//    VBOXVIDEOOFFSET offAddress;
-    BOOLEAN bVisible;
-    BOOLEAN bAssigned;
-} VBOXWDDM_ALLOCATION_SHADOWSURFACE, *PVBOXWDDM_ALLOCATION_SHADOWSURFACE;
-#endif
 
 typedef enum