Changeset 50913 in vbox for trunk/include

Timestamp:

Mar 27, 2014 5:56:50 PM (11 years ago)

Author:

vboxsync

Message:

wddm/graphics: new command submission working for 2D, more testing needed

Location:

trunk/include/VBox

Files:

• VBoxVideo.h (modified) (5 diffs)
• VBoxVideoHost3D.h (modified) (1 diff)

trunk/include/VBox/VBoxVideo.h

@@ -1633 +1633 @@
 typedef uint32_t VBOXCMDVBVAOFFSET;
 typedef uint64_t VBOXCMDVBVAPHADDR;
+typedef uint32_t VBOXCMDVBVAPAGEIDX;
 
 typedef struct VBOXCMDVBVA_CRCMD_BUFFER
@@ -1708 +1709 @@
 } VBOXCMDVBVA_CLRFILL;
 
+#if 0
 #define VBOXCMDVBVA_SYSMEMEL_CPAGES_MAX  0x1000
 
@@ -1716 +1718 @@
     uint32_t iPage2;
 } VBOXCMDVBVA_SYSMEMEL;
+#endif
 
 typedef struct VBOXCMDVBVA_PAGING_TRANSFER
@@ -1723 +1726 @@
      * paging transfer can NOT be initiated for allocations having host 3D object (hostID) associated */
     VBOXCMDVBVA_ALLOCINFO Alloc;
-    uint32_t u32Reserved;
-    VBOXCMDVBVA_SYSMEMEL aSysMem[1];
+    VBOXCMDVBVAPAGEIDX aPageNumbers[1];
 } VBOXCMDVBVA_PAGING_TRANSFER;
 
@@ -1739 +1741 @@
 {
     VBOXCMDVBVA_HDR Hdr;
-    VBOXCMDVBVAPHADDR phSysMem;
+    VBOXCMDVBVAPAGEIDX iPage;
 } VBOXCMDVBVA_SYSMEMCMD;
 

trunk/include/VBox/VBoxVideoHost3D.h

@@ -126 +126 @@
 typedef DECLCALLBACKPTR(uint8_t*, PFNVBOXCRCMDCTL_REMAINING_HOST_COMMAND)(HVBOXCRCMDCTL_REMAINING_HOST_COMMAND hClient, uint32_t *pcbCtl, int prevCmdRc);
 
+typedef struct VBOXCRCMDCTL_HGCMENABLE_DATA
+{
+    HVBOXCRCMDCTL_REMAINING_HOST_COMMAND hRHCmd;
+    PFNVBOXCRCMDCTL_REMAINING_HOST_COMMAND pfnRHCmd;
+} VBOXCRCMDCTL_HGCMENABLE_DATA;
+
+typedef struct VBOXVDMAHOST * HVBOXCRCMDCTL_NOTIFY_TERMINATING;
+
+typedef DECLCALLBACKPTR(int, PFNVBOXCRCMDCTL_NOTIFY_TERMINATING)(HVBOXCRCMDCTL_NOTIFY_TERMINATING hClient, VBOXCRCMDCTL_HGCMENABLE_DATA *pHgcmEnableData);
+
+typedef DECLCALLBACKPTR(void, PFNVBOXCRCMDCTL_NOTIFY_TERMINATING_DONE)(HVBOXCRCMDCTL_NOTIFY_TERMINATING hClient);
+
+typedef struct VBOXCRCMDCTL_HGCMDISABLE_DATA
+{
+    HVBOXCRCMDCTL_NOTIFY_TERMINATING hNotifyTerm;
+    PFNVBOXCRCMDCTL_NOTIFY_TERMINATING pfnNotifyTerm;
+    PFNVBOXCRCMDCTL_NOTIFY_TERMINATING_DONE pfnNotifyTermDone;
+} VBOXCRCMDCTL_HGCMDISABLE_DATA;
+
 typedef struct VBOXCRCMDCTL_ENABLE
 {
     VBOXCRCMDCTL Hdr;
-    HVBOXCRCMDCTL_REMAINING_HOST_COMMAND hRHCmd;
-    PFNVBOXCRCMDCTL_REMAINING_HOST_COMMAND pfnRHCmd;
+    VBOXCRCMDCTL_HGCMENABLE_DATA Data;
 } VBOXCRCMDCTL_ENABLE;
 
+typedef struct VBOXCRCMDCTL_DISABLE
+{
+    VBOXCRCMDCTL Hdr;
+    VBOXCRCMDCTL_HGCMDISABLE_DATA Data;
+} VBOXCRCMDCTL_DISABLE;
+
 #endif /*#ifndef ___VBox_VBoxVideoHost3D_h*/