Changeset 50957 in vbox for trunk/include

Timestamp:

Apr 2, 2014 8:26:07 PM (11 years ago)

Author:

vboxsync

Message:

wddm/crOpenGL/DevVGA: blitting enhancements and cleanup + bugfixes

File:

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

trunk/include/VBox/VBoxVideo.h

@@ -1570 +1570 @@
 /* blit command that does blitting of allocations identified by VRAM offset or host id
  * for VRAM-offset ones the size and format are same as primary */
-#define VBOXCMDVBVA_OPTYPE_BLT_OFFPRIMSZFMT_OR_ID       2
+#define VBOXCMDVBVA_OPTYPE_BLT                          2
 /* flip */
 #define VBOXCMDVBVA_OPTYPE_FLIP                         3
@@ -1587 +1587 @@
 #define VBOXCMDVBVA_OPTYPE_NOP                          0x80
 
-/* u8Flags flags */
-/* source allocation is specified with the host id. if not set - source allocation is specified with VRAM offset */
-#define VBOXCMDVBVA_OPF_ALLOC_SRCID                     0x80
-/* destination allocation is specified with the host id. if not set - destination allocation is specified with VRAM offset */
-#define VBOXCMDVBVA_OPF_ALLOC_DSTID                     0x40
-
-/* transfer from RAM to Allocation */
-#define VBOXCMDVBVA_OPF_PAGING_TRANSFER_IN              0x20
-
-/* VBOXCMDVBVA_OPTYPE_BLT_PRIMARY specific flags*/
-/* if set - src is a primary id */
-#define VBOXCMDVBVA_OPF_ALLOC_SRCPRIMARY               0x20
-/* if set - dst is a primary id */
-#define VBOXCMDVBVA_OPF_ALLOC_DSTPRIMARY               0x10
-
+///* u8Flags flags */
+///* source allocation is specified with the host id. if not set - source allocation is specified with VRAM offset */
+//#define VBOXCMDVBVA_OPF_ALLOC_SRCID                     0x80
+///* destination allocation is specified with the host id. if not set - destination allocation is specified with VRAM offset */
+//#define VBOXCMDVBVA_OPF_ALLOC_DSTID                     0x40
+//
+///* transfer from RAM to Allocation */
+#define VBOXCMDVBVA_OPF_PAGING_TRANSFER_IN                  0x80
+//
+///* VBOXCMDVBVA_OPTYPE_BLT_PRIMARY specific flags*/
+///* if set - src is a primary id */
+//#define VBOXCMDVBVA_OPF_ALLOC_SRCPRIMARY               0x20
+///* if set - dst is a primary id */
+//#define VBOXCMDVBVA_OPF_ALLOC_DSTPRIMARY               0x10
+
+#define VBOXCMDVBVA_OPF_BLT_TYPE_PRIMARY                    0
+#define VBOXCMDVBVA_OPF_BLT_TYPE_PRIMARY_GENERIC_A8R8G8B8   1
+#define VBOXCMDVBVA_OPF_BLT_TYPE_OFFPRIMSZFMT_OR_ID         2
+#define VBOXCMDVBVA_OPF_BLT_TYPE_GENERIC_A8R8G8B8           3
+#define VBOXCMDVBVA_OPF_BLT_TYPE_PRIMARY_PRIMARY            4
+
+#define VBOXCMDVBVA_OPF_BLT_TYPE_MASK                       7
+/* blit direction is from first operand to second */
+#define VBOXCMDVBVA_OPF_BLT_DIR_IN_2                        0x10
+/* operand 1 contains host id */
+#define VBOXCMDVBVA_OPF_OPERAND1_ISID                       0x20
+/* operand 2 contains host id */
+#define VBOXCMDVBVA_OPF_OPERAND2_ISID                       0x40
 
 /* trying to make the header as small as possible,
@@ -1612 +1625 @@
     /* command-specific
      * VBOXCMDVBVA_OPTYPE_CRCMD                     - must be null
-     * VBOXCMDVBVA_OPTYPE_BLT_PRIMARY             - OR-ed VBOXCMDVBVA_OPF_ALLOC_XXX flags
-     * VBOXCMDVBVA_OPTYPE_BLT_OFFPRIMSZFMT_OR_ID    - OR-ed VBOXCMDVBVA_OPF_ALLOC_XXX flags
+     * VBOXCMDVBVA_OPTYPE_BLT                       - OR-ed VBOXCMDVBVA_OPF_ALLOC_XXX flags
      * VBOXCMDVBVA_OPTYPE_PAGING_TRANSFER           - must be null
      * VBOXCMDVBVA_OPTYPE_PAGING_FILL               - must be null
@@ -1662 +1674 @@
 } VBOXCMDVBVA_ALLOCINFO;
 
+typedef struct VBOXCMDVBVA_ALLOCDESC
+{
+    VBOXCMDVBVA_ALLOCINFO Info;
+    uint16_t width;
+    uint16_t height;
+} VBOXCMDVBVA_ALLOCDESC;
+
 typedef struct VBOXCMDVBVA_RECT
 {
@@ -1677 +1696 @@
 } VBOXCMDVBVA_POINT;
 
+typedef struct VBOXCMDVBVA_BLT_HDR
+{
+    VBOXCMDVBVA_HDR Hdr;
+    VBOXCMDVBVA_POINT Pos;
+} VBOXCMDVBVA_BLT_HDR;
+
 typedef struct VBOXCMDVBVA_BLT_PRIMARY
 {
-    VBOXCMDVBVA_HDR Hdr;
+    VBOXCMDVBVA_BLT_HDR Hdr;
     VBOXCMDVBVA_ALLOCINFO alloc;
-    VBOXCMDVBVA_POINT Pos;
     /* the rects count is determined from the command size */
     VBOXCMDVBVA_RECT aRects[1];
 } VBOXCMDVBVA_BLT_PRIMARY;
 
+typedef struct VBOXCMDVBVA_BLT_PRIMARY_GENERIC_A8R8G8B8
+{
+    VBOXCMDVBVA_BLT_HDR Hdr;
+    VBOXCMDVBVA_ALLOCDESC alloc;
+    /* the rects count is determined from the command size */
+    VBOXCMDVBVA_RECT aRects[1];
+} VBOXCMDVBVA_BLT_PRIMARY_GENERIC_A8R8G8B8;
+
 typedef struct VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID
 {
-    VBOXCMDVBVA_HDR Hdr;
-    VBOXCMDVBVA_ALLOCINFO src;
-    VBOXCMDVBVA_ALLOCINFO dst;
-    VBOXCMDVBVA_POINT Pos;
+    VBOXCMDVBVA_BLT_HDR Hdr;
+    VBOXCMDVBVA_ALLOCINFO alloc;
+    uint32_t id;
     /* the rects count is determined from the command size */
     VBOXCMDVBVA_RECT aRects[1];
 } VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID;
+
+typedef struct VBOXCMDVBVA_BLT_GENERIC_A8R8G8B8
+{
+    VBOXCMDVBVA_BLT_HDR Hdr;
+    VBOXCMDVBVA_ALLOCDESC alloc1;
+    VBOXCMDVBVA_ALLOCDESC alloc2;
+    /* the rects count is determined from the command size */
+    VBOXCMDVBVA_RECT aRects[1];
+} VBOXCMDVBVA_BLT_GENERIC_A8R8G8B8;
+
+#define VBOXCMDVBVA_SIZEOF_BLTSTRUCT_MAX (sizeof (VBOXCMDVBVA_BLT_GENERIC_A8R8G8B8))
 
 typedef struct VBOXCMDVBVA_FLIP