Changeset 94524 in vbox for trunk

Timestamp:

Apr 8, 2022 5:19:50 AM (3 years ago)

Author:

vboxsync

Message:

WDDM: rename and enable D3D context in miniport. bugref:9845

Location:

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

Files:

• common/wddm/VBoxMPIf.h (modified) (1 diff)
• mp/Makefile.kmk (modified) (1 diff)
• mp/wddm/VBoxMPWddm.cpp (modified) (2 diffs)

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

@@ -268 +268 @@
     /* Gallium driver context. */
     VBOXWDDM_CONTEXT_TYPE_GA_3D,
-    /* context to handle SVGA_3D_CMD_DX_* commands */
-    VBOXWDDM_CONTEXT_TYPE_VMSVGA_DX,
+    /* Direct3D UMD context for VMSVGA device. */
+    VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D,
 } VBOXWDDM_CONTEXT_TYPE;
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

@@ -170 +170 @@
  endif
 
+ ifdef VBOX_WITH_VMSVGA3D_DX
+  VBoxWddm_DEFS           += VBOX_WITH_VMSVGA3D_DX
+ endif
+
 endif # VBOX_WITH_WDDM
 

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

@@ -4451 +4451 @@
 #ifdef VBOX_WITH_VMSVGA3D_DX
                     /** @todo Implement buffers submittion and memory menagement for this new type of context **/
-                    case VBOXWDDM_CONTEXT_TYPE_VMSVGA_DX:
+                    case VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D:
                     {
-                        pContext->enmType = VBOXWDDM_CONTEXT_TYPE_VMSVGA_DX;
-                        WARN(("Context type VBOXWDDM_CONTEXT_TYPE_VMSVGA_DX is not supported yet"));
+                        /* VMSVGA_D3D context type shares some code with GA_3D, because both work with VMSVGA GPU. */
+                        pContext->enmType = VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D;
+                        Status = GaContextCreate(pDevExt->pGa, pInfo, pContext);
                         break;
                     }
@@ -4536 +4537 @@
 #endif
 #ifdef VBOX_WITH_VMSVGA3D_DX
-        case VBOXWDDM_CONTEXT_TYPE_VMSVGA_DX:
-        {
-            pContext->enmType = VBOXWDDM_CONTEXT_TYPE_VMSVGA_DX;
-            WARN(("Context type VBOXWDDM_CONTEXT_TYPE_VMSVGA_DX is not supported yet"));
+        case VBOXWDDM_CONTEXT_TYPE_VMSVGA_D3D:
+        {
+            Status = GaContextDestroy(pDevExt->pGa, pContext);
             break;
         }