Changeset 36882 in vbox for trunk/include/VBox

Timestamp:

Apr 29, 2011 9:29:08 AM (14 years ago)

Author:

vboxsync

Message:

<VBox/VBoxVideo.h>: make it compile with VBOX_WITH_WDDM disabled

File:

• trunk/include/VBox/VBoxVideo.h (modified) (4 diffs)

trunk/include/VBox/VBoxVideo.h

@@ -1071 +1071 @@
 #define VBOXVIDEOOFFSET_VOID ((VBOXVIDEOOFFSET)~0)
 
-#ifdef VBOX_WITH_WDDM
-# pragma pack(1)
+#pragma pack(1)
 
 /*
@@ -1087 +1086 @@
     uint64_t u64Info2;  /*<- contents depends on the fFlags value */
 } VBOXSHGSMIHEADER, *PVBOXSHGSMIHEADER;
+
+typedef enum
+{
+    VBOXVDMACMD_TYPE_UNDEFINED         = 0,
+    VBOXVDMACMD_TYPE_DMA_PRESENT_BLT   = 1,
+    VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER,
+    VBOXVDMACMD_TYPE_DMA_BPB_FILL,
+    VBOXVDMACMD_TYPE_DMA_PRESENT_SHADOW2PRIMARY,
+    VBOXVDMACMD_TYPE_DMA_PRESENT_CLRFILL,
+    VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP,
+    VBOXVDMACMD_TYPE_DMA_NOP,
+    VBOXVDMACMD_TYPE_CHROMIUM_CMD,
+    VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER_VRAMSYS
+} VBOXVDMACMD_TYPE;
+
+#pragma pack()
 
 /* the command processing was asynch, set by the host to indicate asynch command completion
@@ -1114 +1129 @@
 #define VBOXSHGSMI_FLAG_GH_SYNCH                0x00000040
 
+
 DECLINLINE(uint8_t *) VBoxSHGSMIBufferData (const VBOXSHGSMIHEADER* pHeader)
 {
@@ -1123 +1139 @@
     return (PVBOXSHGSMIHEADER)((uint8_t *)pvData - sizeof (VBOXSHGSMIHEADER));
 }
-
-typedef enum
-{
-    VBOXVDMACMD_TYPE_UNDEFINED         = 0,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_BLT   = 1,
-    VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER,
-    VBOXVDMACMD_TYPE_DMA_BPB_FILL,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_SHADOW2PRIMARY,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_CLRFILL,
-    VBOXVDMACMD_TYPE_DMA_PRESENT_FLIP,
-    VBOXVDMACMD_TYPE_DMA_NOP,
-    VBOXVDMACMD_TYPE_CHROMIUM_CMD,
-    VBOXVDMACMD_TYPE_DMA_BPB_TRANSFER_VRAMSYS
-} VBOXVDMACMD_TYPE;
-
-# pragma pack()
-#endif
 
 #ifdef VBOX_WITH_VDMA