Changeset 33116 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Oct 13, 2010 9:06:35 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: chromium hgsmi transport (guest part, disabled)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Files:

• VBoxVideoIf.h (modified) (4 diffs)
• VBoxVideoWddm.cpp (modified) (2 diffs)
• VBoxVideoWddm.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoIf.h

@@ -24 +24 @@
 #include <VBox/VBoxVideo.h>
 #include "../../../include/VBoxDisplay.h"
-#include "VBoxUhgsmi.h"
+#include <VBox/VBoxUhgsmi.h>
 
 #include <iprt/assert.h>
@@ -30 +30 @@
 
 /* One would increase this whenever definitions in this file are changed */
-#define VBOXVIDEOIF_VERSION 6
+#define VBOXVIDEOIF_VERSION 7
 
 /* create allocation func */
@@ -206 +206 @@
 } VBOXWDDM_OVERLAYFLIP_INFO, *PVBOXWDDM_OVERLAYFLIP_INFO;
 
+
+typedef enum
+{
+    VBOXWDDM_CONTEXT_TYPE_UNDEFINED = 0,
+    VBOXWDDM_CONTEXT_TYPE_SYSTEM,
+    VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D,
+    VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D,
+    VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_3D,
+    VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL
+} VBOXWDDM_CONTEXT_TYPE;
+
 typedef struct VBOXWDDM_CREATECONTEXT_INFO
 {
@@ -211 +222 @@
     uint32_t u32IfVersion;
     /* true if d3d false if ddraw */
-    uint32_t u32IsD3D;
+    VBOXWDDM_CONTEXT_TYPE enmType;
     /* 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 */

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -892 +892 @@
             /* this is not entirely correct since host may concurrently complete some commands and raise a new IRQ while we are here,
              * still this allows to check that the host flags are correctly cleared after the ISR */
-            Assert(pDevExt->u.primary.pHostFlags);
-            uint32_t flags = pDevExt->u.primary.pHostFlags->u32HostFlags;
+            Assert(commonFromDeviceExt(pDevExt)->pHostFlags);
+            uint32_t flags = commonFromDeviceExt(pDevExt)->pHostFlags->u32HostFlags;
             Assert(flags == 0);
 #endif
@@ -4730 +4730 @@
             {
                 PVBOXWDDM_CREATECONTEXT_INFO pInfo = (PVBOXWDDM_CREATECONTEXT_INFO)pCreateContext->pPrivateDriverData;
-                if (pInfo->u32IsD3D)
+                switch (pInfo->enmType)
                 {
-                    ExInitializeFastMutex(&pContext->SwapchainMutex);
-                    Status = vboxWddmHTableCreate(&pContext->Swapchains, 4);
-                    Assert(Status == STATUS_SUCCESS);
-                    if (Status == STATUS_SUCCESS)
+                    case VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D:
                     {
-                        pContext->enmType = VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D;
-                        Status = vboxVideoCmCtxAdd(&pDevice->pAdapter->CmMgr, &pContext->CmContext, (HANDLE)pInfo->hUmEvent, pInfo->u64UmInfo);
+                        ExInitializeFastMutex(&pContext->SwapchainMutex);
+                        Status = vboxWddmHTableCreate(&pContext->Swapchains, 4);
                         Assert(Status == STATUS_SUCCESS);
                         if (Status == STATUS_SUCCESS)
                         {
-//                            Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
-//                            ExAcquireFastMutex(&pDevExt->ContextMutex);
-                            ASMAtomicIncU32(&pDevExt->cContexts3D);
-//                            ExReleaseFastMutex(&pDevExt->ContextMutex);
+                            pContext->enmType = VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D;
+                            Status = vboxVideoCmCtxAdd(&pDevice->pAdapter->CmMgr, &pContext->CmContext, (HANDLE)pInfo->hUmEvent, pInfo->u64UmInfo);
+                            Assert(Status == STATUS_SUCCESS);
+                            if (Status == STATUS_SUCCESS)
+                            {
+    //                            Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
+    //                            ExAcquireFastMutex(&pDevExt->ContextMutex);
+                                ASMAtomicIncU32(&pDevExt->cContexts3D);
+    //                            ExReleaseFastMutex(&pDevExt->ContextMutex);
+                            }
+                            else
+                            {
+                                vboxWddmHTableDestroy(&pContext->Swapchains);
+                            }
                         }
-                        else
-                        {
-                            vboxWddmHTableDestroy(&pContext->Swapchains);
-                        }
+                        break;
                     }
-                }
-                else
-                {
-                    pContext->enmType = VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D;
+                    case VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D:
+                    case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_3D:
+                    case VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL:
+                    {
+                        pContext->enmType = pInfo->enmType;
+                        break;
+                    }
+                    default:
+                    {
+                        Assert(0);
+                        Status = STATUS_INVALID_PARAMETER;
+                        break;
+                    }
                 }
             }

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.h

@@ -146 +146 @@
 }VBOXWDDM_SWAPCHAIN, *PVBOXWDDM_SWAPCHAIN;
 
-typedef enum
-{
-    VBOXWDDM_CONTEXT_TYPE_UNDEFINED = 0,
-    VBOXWDDM_CONTEXT_TYPE_SYSTEM,
-    VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D,
-    VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D
-} VBOXWDDM_CONTEXT_TYPE;
-
 typedef struct VBOXWDDM_CONTEXT
 {