Changeset 49474 in vbox for trunk/include

Timestamp:

Nov 14, 2013 6:49:54 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: some host bits for buffer-based command submission

Location:

trunk/include/VBox

Files:

• HostServices/VBoxCrOpenGLSvc.h (modified) (2 diffs)
• VBoxVideo.h (modified) (3 diffs)
• VBoxVideo3D.h (modified) (1 diff)
• vmm/pdmifs.h (modified) (1 diff)

trunk/include/VBox/HostServices/VBoxCrOpenGLSvc.h

@@ -44 +44 @@
 #define SHCRGL_HOST_FN_VIEWPORT_CHANGED (15)
 #define SHCRGL_HOST_FN_SET_OUTPUT_REDIRECT (20)
+#define SHCRGL_HOST_FN_CRCMD_NOTIFY_CMDS    (21)
 /* crOpenGL guest functions */
 #define SHCRGL_GUEST_FN_WRITE       (2)
@@ -69 +70 @@
 #define SHCRGL_CPARMS_WRITE_READ_BUFFERED (3)
 #define SHCRGL_CPARMS_SET_OUTPUT_REDIRECT (1)
+#define SHCRGL_CPARMS_CRCMD_NOTIFY_CMDS (0)
 #define SHCRGL_CPARMS_VIEWPORT_CHANGED (5)
 #define SHCRGL_CPARMS_GET_CAPS (1)

trunk/include/VBox/VBoxVideo.h

@@ -1458 +1458 @@
     };
     uint64_t cbVRam;
+    struct VBOXCRCMD_CLTINFO *pCrCmdClientInfo;
 } VBOXVDMACMD_CHROMIUM_CTL_CRHGSMI_SETUP, *PVBOXVDMACMD_CHROMIUM_CTL_CRHGSMI_SETUP;
 
@@ -1567 +1568 @@
 
 /* CrHgsmi command */
-#define VBOXCMDVBVA_OPTYPE_CRCMD 1
-/* blit command (e.g. shadow to primary) */
-#define VBOXCMDVBVA_OPTYPE_BLT   2
+#define VBOXCMDVBVA_OPTYPE_CRCMD                        1
+/* special case for blitting to primary */
+#define VBOXCMDVBVA_OPTYPE_BLT_TOPRIMARY                2
+/* 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       3
+/* allocation paging transfer request */
+#define VBOXCMDVBVA_OPTYPE_PAGING_TRANSFER              4
+/* allocation paging fill request */
+#define VBOXCMDVBVA_OPTYPE_PAGING_FILL                  5
 /* nop - is a one-bit command. The buffer size to skip is determined by VBVA buffer size */
-#define VBOXCMDVBVA_OPTYPE_NOP   0x80
+#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
+
 
 /* trying to make the header as small as possible,
@@ -1580 +1598 @@
     /* one VBOXCMDVBVA_OPTYPE_XXX, ecxept NOP, see comments above */
     uint8_t u8OpCode;
-    /* reserved, must be null */
-    uint8_t u8Reserved;
+    /* command-specific
+     * VBOXCMDVBVA_OPTYPE_CRCMD - must be null
+     * VBOXCMDVBVA_OPTYPE_BLT_TOPRIMARY - OR-ed VBOXCMDVBVA_OPF_ALLOC_XXX flags
+     * VBOXCMDVBVA_OPTYPE_BLT_OFFPRIMSZFMT_OR_ID - OR-ed VBOXCMDVBVA_OPF_ALLOC_XXX flags
+     * VBOXCMDVBVA_OPTYPE_NOP - must be null */
+    uint8_t u8Flags;
     /* one of VBOXCMDVBVA_STATE_XXX*/
     volatile uint8_t u8State;
-    /* result, 0 on success, otherwise contains the failure code TBD */
-    int8_t u8Result;
+    union
+    {
+        /* result, 0 on success, otherwise contains the failure code TBD */
+        int8_t i8Result;
+        uint8_t u8PrimaryID;
+    };
     /* DXGK DDI fence ID */
     uint32_t u32FenceID;
 } VBOXCMDVBVA_HDR;
 
+typedef uint32_t VBOXCMDVBVAOFFSET;
+typedef uint64_t VBOXCMDVBVAPHADDR;
+
 typedef struct VBOXCMDVBVA_CRCMD
 {
     VBOXCMDVBVA_HDR Hdr;
-    VBOXVIDEOOFFSET offCmd;
+    VBOXCMDVBVAOFFSET offCmd;
 } VBOXCMDVBVA_CRCMD;
+
+typedef struct VBOXCMDVBVA_ALLOCINFO
+{
+    union
+    {
+        VBOXCMDVBVAOFFSET offVRAM;
+        uint32_t id;
+    };
+} VBOXCMDVBVA_ALLOCINFO;
+
+typedef struct VBOXCMDVBVA_RECT
+{
+   /** Coordinates of affected rectangle. */
+   int16_t x;
+   int16_t y;
+   uint16_t w;
+   uint16_t h;
+} VBOXCMDVBVA_RECT;
+
+typedef struct VBOXCMDVBVA_BLT_TOPRIMARY
+{
+    VBOXCMDVBVA_HDR Hdr;
+    VBOXCMDVBVA_ALLOCINFO src;
+    /* the rects count is determined from the command size */
+    VBOXCMDVBVA_RECT aRects[1];
+} VBOXCMDVBVA_BLT_TOPRIMARY;
+
+typedef struct VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID
+{
+    VBOXCMDVBVA_HDR Hdr;
+    VBOXCMDVBVA_ALLOCINFO src;
+    VBOXCMDVBVA_ALLOCINFO dst;
+    /* the rects count is determined from the command size */
+    VBOXCMDVBVA_RECT aRects[1];
+} VBOXCMDVBVA_BLT_OFFPRIMSZFMT_OR_ID;
+
+typedef struct VBOXCMDVBVA_PAGING_TRANSFER
+{
+    VBOXCMDVBVA_HDR Hdr;
+    VBOXCMDVBVAPHADDR Addr;
+    /* for now can only contain offVRAM.
+     * paging transfer can NOT be initiated for allocations having host 3D object (hostID) associated */
+    VBOXCMDVBVA_ALLOCINFO Alloc;
+} VBOXCMDVBVA_PAGING_TRANSFER;
+
+typedef struct VBOXCMDVBVA_PAGING_FILL
+{
+    VBOXCMDVBVA_HDR Hdr;
+    uint32_t cbFill;
+    uint32_t Pattern;
+    /* paging transfer can NOT be initiated for allocations having host 3D object (hostID) associated */
+    VBOXCMDVBVAOFFSET offVRAM;
+} VBOXCMDVBVA_PAGING_FILL;
 
 # pragma pack()

trunk/include/VBox/VBoxVideo3D.h

@@ -140 +140 @@
 #define VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA 2
 
+
+/* interface between the VGA device and 3D Server Backend
+ * VGA device and 3D backend work together in processing the VBVA-based ring buffer commands comming from guest.
+ * With this interaction VGA device acts like a client, while 3D backend acts as a server.
+ * VGA device can process some commands itself, while some of them are delegated to the 3D backend.
+ *
+ * */
+/* client handle, passed to client callbacks (see below) */
+typedef struct VBOXVDMAHOST *HVBOXCRCMDCLT;
+
+
+typedef struct VBOXCMDVBVA_HDR *PVBOXCMDVBVA_HDR;
+
+/* server queries client for the next command,
+ * the obtained command must be returned to the client right after it gets processed,
+ * the next PFNVBOXCRCMD_CLT_CMDGET call completes the previously submitted command,
+ * Must not be called from the EMT thread.*/
+typedef DECLCALLBACKPTR(int, PFNVBOXCRCMD_CLT_CMDGET)(HVBOXCRCMDCLT hClt, PVBOXCMDVBVA_HDR *ppNextCmd, uint32_t *pcbNextCmd);
+
+/* Client callbacks (i.e. those client exposes to the server) */
+typedef struct VBOXCRCMD_CLTINFO
+{
+    HVBOXCRCMDCLT hClient;
+    PFNVBOXCRCMD_CLT_CMDGET pfnCmdGet;
+} VBOXCRCMD_CLTINFO;
+
+
+
 #endif /* #ifndef ___VBox_VBoxVideo3D_h */

trunk/include/VBox/vmm/pdmifs.h

@@ -750 +750 @@
      * @thread  The emulation thread.
      */
+    DECLR3CALLBACKMEMBER(int, pfnCrCmdNotifyCmds, (PPDMIDISPLAYCONNECTOR pInterface));
+
+    /**
+     * Process the guest chromium command.
+     *
+     * @param   pInterface          Pointer to this interface.
+     * @param   pCmd                Video HW Acceleration Command to be processed.
+     * @thread  The emulation thread.
+     */
     DECLR3CALLBACKMEMBER(void, pfnCrHgsmiCommandProcess, (PPDMIDISPLAYCONNECTOR pInterface, PVBOXVDMACMD_CHROMIUM_CMD pCmd, uint32_t cbCmd));