Changeset 80876 in vbox for trunk/include/VBox/Graphics

Timestamp:

Sep 18, 2019 6:09:19 AM (6 years ago)

Author:

vboxsync

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

133448

Message:

Additions/WINNT/Graphics,include: remove obsolete Chromium code. bugref:9529

File:

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

trunk/include/VBox/Graphics/VBoxVideo.h

@@ -1407 +1407 @@
 } VBOXVDMA_CTL;
 
-typedef struct VBOXVDMA_RECTL
-{
-    int16_t left;
-    int16_t top;
-    uint16_t width;
-    uint16_t height;
-} VBOXVDMA_RECTL, *PVBOXVDMA_RECTL;
-
-typedef enum
-{
-    VBOXVDMA_PIXEL_FORMAT_UNKNOWN      =  0,
-    VBOXVDMA_PIXEL_FORMAT_R8G8B8       = 20,
-    VBOXVDMA_PIXEL_FORMAT_A8R8G8B8     = 21,
-    VBOXVDMA_PIXEL_FORMAT_X8R8G8B8     = 22,
-    VBOXVDMA_PIXEL_FORMAT_R5G6B5       = 23,
-    VBOXVDMA_PIXEL_FORMAT_X1R5G5B5     = 24,
-    VBOXVDMA_PIXEL_FORMAT_A1R5G5B5     = 25,
-    VBOXVDMA_PIXEL_FORMAT_A4R4G4B4     = 26,
-    VBOXVDMA_PIXEL_FORMAT_R3G3B2       = 27,
-    VBOXVDMA_PIXEL_FORMAT_A8           = 28,
-    VBOXVDMA_PIXEL_FORMAT_A8R3G3B2     = 29,
-    VBOXVDMA_PIXEL_FORMAT_X4R4G4B4     = 30,
-    VBOXVDMA_PIXEL_FORMAT_A2B10G10R10  = 31,
-    VBOXVDMA_PIXEL_FORMAT_A8B8G8R8     = 32,
-    VBOXVDMA_PIXEL_FORMAT_X8B8G8R8     = 33,
-    VBOXVDMA_PIXEL_FORMAT_G16R16       = 34,
-    VBOXVDMA_PIXEL_FORMAT_A2R10G10B10  = 35,
-    VBOXVDMA_PIXEL_FORMAT_A16B16G16R16 = 36,
-    VBOXVDMA_PIXEL_FORMAT_A8P8         = 40,
-    VBOXVDMA_PIXEL_FORMAT_P8           = 41,
-    VBOXVDMA_PIXEL_FORMAT_L8           = 50,
-    VBOXVDMA_PIXEL_FORMAT_A8L8         = 51,
-    VBOXVDMA_PIXEL_FORMAT_A4L4         = 52,
-    VBOXVDMA_PIXEL_FORMAT_V8U8         = 60,
-    VBOXVDMA_PIXEL_FORMAT_L6V5U5       = 61,
-    VBOXVDMA_PIXEL_FORMAT_X8L8V8U8     = 62,
-    VBOXVDMA_PIXEL_FORMAT_Q8W8V8U8     = 63,
-    VBOXVDMA_PIXEL_FORMAT_V16U16       = 64,
-    VBOXVDMA_PIXEL_FORMAT_W11V11U10    = 65,
-    VBOXVDMA_PIXEL_FORMAT_A2W10V10U10  = 67
-} VBOXVDMA_PIXEL_FORMAT;
-
-typedef struct VBOXVDMA_SURF_DESC
-{
-    uint32_t width;
-    uint32_t height;
-    VBOXVDMA_PIXEL_FORMAT format;
-    uint32_t bpp;
-    uint32_t pitch;
-    uint32_t fFlags;
-} VBOXVDMA_SURF_DESC, *PVBOXVDMA_SURF_DESC;
-
-/*typedef uint64_t VBOXVDMAPHADDRESS;*/
-typedef uint64_t VBOXVDMASURFHANDLE;
-
-/* region specified as a rectangle, otherwize it is a size of memory pointed to by phys address */
-#define VBOXVDMAOPERAND_FLAGS_RECTL       0x1
-/* Surface handle is valid */
-#define VBOXVDMAOPERAND_FLAGS_PRIMARY        0x2
-/* address is offset in VRAM */
-#define VBOXVDMAOPERAND_FLAGS_VRAMOFFSET  0x4
-
-
 /* VBOXVDMACBUF_DR::phBuf specifies offset in VRAM */
 #define VBOXVDMACBUF_FLAG_BUF_VRAM_OFFSET 0x00000001
@@ -1521 +1458 @@
 #define VBOXVDMACMD_BODY_FIELD_OFFSET(_ot, _t, _f)  ( (_ot)(uintptr_t)( VBOXVDMACMD_BODY(0, uint8_t) + RT_UOFFSETOF_DYN(_t, _f) ) )
 
-typedef struct VBOXVDMACMD_DMA_PRESENT_BLT
-{
-    VBOXVIDEOOFFSET offSrc;
-    VBOXVIDEOOFFSET offDst;
-    VBOXVDMA_SURF_DESC srcDesc;
-    VBOXVDMA_SURF_DESC dstDesc;
-    VBOXVDMA_RECTL srcRectl;
-    VBOXVDMA_RECTL dstRectl;
-    uint32_t u32Reserved;
-    uint32_t cDstSubRects;
-    VBOXVDMA_RECTL aDstSubRects[1];
-} VBOXVDMACMD_DMA_PRESENT_BLT, *PVBOXVDMACMD_DMA_PRESENT_BLT;
-
-typedef struct VBOXVDMACMD_DMA_PRESENT_SHADOW2PRIMARY
-{
-    VBOXVDMA_RECTL Rect;
-} VBOXVDMACMD_DMA_PRESENT_SHADOW2PRIMARY, *PVBOXVDMACMD_DMA_PRESENT_SHADOW2PRIMARY;
-
-
-#define VBOXVDMACMD_DMA_BPB_TRANSFER_F_SRC_VRAMOFFSET 0x00000001
-#define VBOXVDMACMD_DMA_BPB_TRANSFER_F_DST_VRAMOFFSET 0x00000002
-
-typedef struct VBOXVDMACMD_DMA_BPB_TRANSFER
-{
-    uint32_t cbTransferSize;
-    uint32_t fFlags;
-    union
-    {
-        uint64_t phBuf;
-        VBOXVIDEOOFFSET offVramBuf;
-    } Src;
-    union
-    {
-        uint64_t phBuf;
-        VBOXVIDEOOFFSET offVramBuf;
-    } Dst;
-} VBOXVDMACMD_DMA_BPB_TRANSFER, *PVBOXVDMACMD_DMA_BPB_TRANSFER;
-
-#define VBOXVDMACMD_SYSMEMEL_F_PAGELIST 0x00000001
-
-typedef struct VBOXVDMACMD_SYSMEMEL
-{
-    uint32_t cPages;
-    uint32_t fFlags;
-    uint64_t phBuf[1];
-} VBOXVDMACMD_SYSMEMEL, *PVBOXVDMACMD_SYSMEMEL;
-
-#define VBOXVDMACMD_SYSMEMEL_NEXT(_pEl) ( ((_pEl)->fFlags & VBOXVDMACMD_SYSMEMEL_F_PAGELIST) \
-        ? ((PVBOXVDMACMD_SYSMEMEL)(((uint8_t*)(_pEl)) + RT_UOFFSETOF_DYN(VBOXVDMACMD_SYSMEMEL, phBuf[(_pEl)->cPages]))) \
-        : ((_pEl) + 1) )
-
-#define VBOXVDMACMD_DMA_BPB_TRANSFER_VRAMSYS_SYS2VRAM 0x00000001
-
-typedef struct VBOXVDMACMD_DMA_BPB_TRANSFER_VRAMSYS
-{
-    uint32_t cTransferPages;
-    uint32_t fFlags;
-    VBOXVIDEOOFFSET offVramBuf;
-    VBOXVDMACMD_SYSMEMEL FirstEl;
-} VBOXVDMACMD_DMA_BPB_TRANSFER_VRAMSYS, *PVBOXVDMACMD_DMA_BPB_TRANSFER_VRAMSYS;
-
-typedef struct VBOXVDMACMD_DMA_BPB_FILL
-{
-    VBOXVIDEOOFFSET offSurf;
-    uint32_t cbFillSize;
-    uint32_t u32FillPattern;
-} VBOXVDMACMD_DMA_BPB_FILL, *PVBOXVDMACMD_DMA_BPB_FILL;
+# pragma pack()
+#endif /* #ifdef VBOX_WITH_VDMA */
+
 
 #define VBOXVDMA_CHILD_STATUS_F_CONNECTED    0x01
@@ -1611 +1484 @@
 } VBOXVDMACMD_CHILD_STATUS_IRQ, *PVBOXVDMACMD_CHILD_STATUS_IRQ;
 
-# pragma pack()
-#endif /* #ifdef VBOX_WITH_VDMA */
-
 #define VBOXCMDVBVA_SCREENMAP_SIZE(_elType) ((VBOX_VIDEO_MAX_SCREENS + sizeof (_elType) - 1) / sizeof (_elType))
 #define VBOXCMDVBVA_SCREENMAP_DECL(_elType, _name) _elType _name[VBOXCMDVBVA_SCREENMAP_SIZE(_elType)]