Changeset 74493 in vbox

Timestamp:

Sep 27, 2018 11:46:54 AM (6 years ago)

Author:

vboxsync

Message:

WDDM: union for context specific data. bugref:8893

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• common/wddm/VBoxMPIf.h (modified) (1 diff)
• disp/wddm/VBoxDispCm.cpp (modified) (2 diffs)
• disp/wddm/shared/VBoxDispKmt.cpp (modified) (1 diff)
• mp/wddm/VBoxMPWddm.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -271 +271 @@
     /* true if d3d false if ddraw */
     VBOXWDDM_CONTEXT_TYPE enmType;
-    uint32_t crVersionMajor;
-    uint32_t crVersionMinor;
-    /* we use uint64_t instead of HANDLE to ensure structure def is the same for both 32-bit and 64-bit
-     * since x64 kernel driver can be called by 32-bit UMD */
-    uint64_t hUmEvent;
-    /* info to be passed to UMD notification to identify the context */
-    uint64_t u64UmInfo;
+    union
+    {
+        struct
+        {
+            uint32_t crVersionMajor;
+            uint32_t crVersionMinor;
+            /* we use uint64_t instead of HANDLE to ensure structure def is the same for both 32-bit and 64-bit
+             * since x64 kernel driver can be called by 32-bit UMD */
+            uint64_t hUmEvent;
+            /* info to be passed to UMD notification to identify the context */
+            uint64_t u64UmInfo;
+        } vbox;
+    } u;
 } VBOXWDDM_CREATECONTEXT_INFO, *PVBOXWDDM_CREATECONTEXT_INFO;
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispCm.cpp

@@ -124 +124 @@
         Info.enmType = VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D;
 #ifdef VBOX_WITH_CROGL
-        Info.crVersionMajor = CR_PROTOCOL_VERSION_MAJOR;
-        Info.crVersionMinor = CR_PROTOCOL_VERSION_MINOR;
+        Info.u.vbox.crVersionMajor = CR_PROTOCOL_VERSION_MAJOR;
+        Info.u.vbox.crVersionMinor = CR_PROTOCOL_VERSION_MINOR;
 #else
         WARN(("not expected"));
-        Info.crVersionMajor = 0;
-        Info.crVersionMinor = 0;
+        Info.u.vbox.crVersionMajor = 0;
+        Info.u.vbox.crVersionMinor = 0;
 #endif
         fIsCrContext = TRUE;
@@ -138 +138 @@
         fIsCrContext = FALSE;
     }
-    Info.hUmEvent = (uintptr_t)g_pVBoxCmMgr.Session.hEvent;
-    Info.u64UmInfo = (uintptr_t)pContext;
+    Info.u.vbox.hUmEvent = (uintptr_t)g_pVBoxCmMgr.Session.hEvent;
+    Info.u.vbox.u64UmInfo = (uintptr_t)pContext;
 
     if (VBOXDISPMODE_IS_3D(pDevice->pAdapter))

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared/VBoxDispKmt.cpp

@@ -376 +376 @@
     Info.u32IfVersion = 9;
     Info.enmType = enmType;
-    Info.crVersionMajor = crVersionMajor;
-    Info.crVersionMinor = crVersionMinor;
-    Info.hUmEvent = (uintptr_t)hEvent;
-    Info.u64UmInfo = u64UmInfo;
+    Info.u.vbox.crVersionMajor = crVersionMajor;
+    Info.u.vbox.crVersionMinor = crVersionMinor;
+    Info.u.vbox.hUmEvent = (uintptr_t)hEvent;
+    Info.u.vbox.u64UmInfo = u64UmInfo;
     D3DKMT_CREATECONTEXT ContextData = {0};
     ContextData.hDevice = pDevice->hDevice;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -6945 +6945 @@
                             {
                                 pContext->enmType = VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D;
-                                Status = vboxVideoCmCtxAdd(&pDevice->pAdapter->CmMgr, &pContext->CmContext, (HANDLE)pInfo->hUmEvent, pInfo->u64UmInfo);
+                                Status = vboxVideoCmCtxAdd(&pDevice->pAdapter->CmMgr, &pContext->CmContext, (HANDLE)pInfo->u.vbox.hUmEvent, pInfo->u.vbox.u64UmInfo);
                                 AssertNtStatusSuccess(Status);
                                 if (Status == STATUS_SUCCESS)
                                 {
-                                    if (pInfo->crVersionMajor || pInfo->crVersionMinor)
+                                    if (pInfo->u.vbox.crVersionMajor || pInfo->u.vbox.crVersionMinor)
                                     {
                                         if (pDevExt->f3DEnabled)
@@ -6956 +6956 @@
                                             {
                                                 int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon,
-                                                    pInfo->crVersionMajor, pInfo->crVersionMinor,
+                                                    pInfo->u.vbox.crVersionMajor, pInfo->u.vbox.crVersionMinor,
                                                     &pContext->u32CrConClientID);
                                                 if (RT_SUCCESS(rc))
@@ -7004 +7004 @@
                         if (Status == STATUS_SUCCESS)
                         {
-                            if (pInfo->crVersionMajor || pInfo->crVersionMinor)
+                            if (pInfo->u.vbox.crVersionMajor || pInfo->u.vbox.crVersionMinor)
                             {
                                 if (pDevExt->f3DEnabled)
@@ -7011 +7011 @@
                                     {
                                         int rc = VBoxMpCrCtlConConnect(pDevExt, &pDevExt->CrCtlCon,
-                                            pInfo->crVersionMajor, pInfo->crVersionMinor,
+                                            pInfo->u.vbox.crVersionMajor, pInfo->u.vbox.crVersionMinor,
                                             &pContext->u32CrConClientID);
                                         if (!RT_SUCCESS(rc))
@@ -7052 +7052 @@
                     {
                         pContext->enmType = pInfo->enmType;
-                        Status = vboxVideoCmCtxAdd(&pDevice->pAdapter->SeamlessCtxMgr, &pContext->CmContext, (HANDLE)pInfo->hUmEvent, pInfo->u64UmInfo);
+                        Status = vboxVideoCmCtxAdd(&pDevice->pAdapter->SeamlessCtxMgr, &pContext->CmContext, (HANDLE)pInfo->u.vbox.hUmEvent, pInfo->u.vbox.u64UmInfo);
                         if (!NT_SUCCESS(Status))
                         {