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

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

Files:

• Display/wddm/VBoxDispCm.cpp (modified) (1 diff)
• Display/wddm/VBoxDispD3D.def (modified) (1 diff)
• Display/wddm/VBoxDispD3D.h (modified) (3 diffs)
• Display/wddm/VBoxDispD3D64.def (modified) (1 diff)
• Display/wddm/VBoxScreen.cpp (modified) (1 diff)
• Display/wddm/VBoxUhgsmiDisp.cpp (modified) (9 diffs)
• Display/wddm/VBoxUhgsmiDisp.h (modified) (1 diff)
• Display/wddm/VBoxUhgsmiKmt.cpp (added)
• Display/wddm/VBoxUhgsmiKmt.h (added)
• Miniport/wddm/VBoxVideoIf.h (modified) (4 diffs)
• Miniport/wddm/VBoxVideoWddm.cpp (modified) (2 diffs)
• Miniport/wddm/VBoxVideoWddm.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispCm.cpp

@@ -109 +109 @@
     VBOXWDDM_CREATECONTEXT_INFO Info;
     Info.u32IfVersion = pDevice->u32IfVersion;
-    Info.u32IsD3D = VBOXDISPMODE_IS_3D(pDevice->pAdapter);
+    Info.enmType = VBOXDISPMODE_IS_3D(pDevice->pAdapter) ? VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D : VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D;
     Info.hUmEvent = (uint64_t)g_pVBoxCmMgr.Session.hEvent;
     Info.u64UmInfo = (uint64_t)pContext;

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.def

@@ -20 +20 @@
         OpenAdapter
         VBoxDispMpGetCallbacks
-
+    VBoxDispCrHgsmiInit
+    VBoxDispCrHgsmiTerm
+    VBoxDispCrHgsmiQueryClient

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.h

@@ -18 +18 @@
 #include "VBoxDispD3DIf.h"
 #include "../../Miniport/wddm/VBoxVideoIf.h"
+#ifdef VBOX_WITH_CRHGSMI
 #include "VBoxUhgsmiDisp.h"
+#endif
 
 #include <iprt/cdefs.h>
@@ -178 +180 @@
     D3DVIEWPORT9 ViewPort;
     VBOXWDDMDISP_CONTEXT DefaultContext;
+#ifdef VBOX_WITH_CRHGSMI
     VBOXUHGSMI_PRIVATE_D3D Uhgsmi;
+#endif
 
     CRITICAL_SECTION DirtyAllocListLock;
@@ -262 +266 @@
 } VBOXWDDMDISP_OVERLAY, *PVBOXWDDMDISP_OVERLAY;
 
+#ifdef VBOX_WITH_CRHGSMI
+int vboxUhgsmiGlobalSetCurrent();
+int vboxUhgsmiGlobalClearCurrent();
+#endif
+
 #define VBOXDISPMODE_IS_3D(_p) (!!((_p)->pD3D9If))
 #ifdef VBOXDISP_EARLYCREATEDEVICE

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D64.def

@@ -20 +20 @@
         OpenAdapter
         VBoxDispMpGetCallbacks
-
+    VBoxDispCrHgsmiInit
+    VBoxDispCrHgsmiTerm
+    VBoxDispCrHgsmiQueryClient

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxScreen.cpp

@@ -364 +364 @@
         pMon->pfnD3DKMTEscape = (PFND3DKMT_ESCAPE)GetProcAddress(pMon->hGdi32, "D3DKMTEscape");
         Log((__FUNCTION__": pfnD3DKMTEscape = %p\n", pMon->pfnD3DKMTEscape));
-        bSupported &= !!(pMon->pfnD3DKMTCloseAdapter);
+        bSupported &= !!(pMon->pfnD3DKMTEscape);
 
         Assert(bSupported);

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiDisp.cpp

@@ -20 +20 @@
 typedef struct VBOXUHGSMI_BUFFER_PRIVATE_D3D
 {
-    VBOXUHGSMI_BUFFER Base;
+    VBOXUHGSMI_BUFFER_PRIVATE_BASE BasePrivate;
     PVBOXWDDMDISP_DEVICE pDevice;
-    D3DKMT_HANDLE hAllocation;
     UINT aLockPageIndices[1];
 } VBOXUHGSMI_BUFFER_PRIVATE_D3D, *PVBOXUHGSMI_BUFFER_PRIVATE_D3D;
 
-#define VBOXUHGSMID3D_GET_PRIVATE(_p, _t) ((_t*)(((uint8_t*)_p) - RT_OFFSETOF(_t, Base)))
+#define VBOXUHGSMID3D_GET_PRIVATE(_p, _t) ((_t*)(((uint8_t*)_p) - RT_OFFSETOF(_t, BasePrivate.Base)))
 #define VBOXUHGSMID3D_GET(_p) VBOXUHGSMID3D_GET_PRIVATE(_p, VBOXUHGSMI_PRIVATE_D3D)
 #define VBOXUHGSMID3D_GET_BUFFER(_p) VBOXUHGSMID3D_GET_PRIVATE(_p, VBOXUHGSMI_BUFFER_PRIVATE_D3D)
@@ -36 +35 @@
     DdiDealloc.hResource = 0;
     DdiDealloc.NumAllocations = 1;
-    DdiDealloc.HandleList = &pBuffer->hAllocation;
+    DdiDealloc.HandleList = &pBuffer->BasePrivate.hAllocation;
     HRESULT hr = pBuffer->pDevice->RtCallbacks.pfnDeallocateCb(pBuffer->pDevice->hDevice, &DdiDealloc);
     Assert(hr == S_OK);
     if (hr == S_OK)
     {
-        if (pBuffer->Base.bSynchCreated)
+        if (pBuffer->BasePrivate.Base.bSynchCreated)
         {
-            CloseHandle(pBuffer->Base.hSynch);
+            CloseHandle(pBuffer->BasePrivate.Base.hSynch);
         }
         RTMemFree(pBuffer);
@@ -55 +54 @@
     PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuffer = VBOXUHGSMID3D_GET_BUFFER(pBuf);
     D3DDDICB_LOCK DdiLock;
-    DdiLock.hAllocation = pBuffer->hAllocation;
+    DdiLock.hAllocation = pBuffer->BasePrivate.hAllocation;
     DdiLock.PrivateDriverData = 0;
 
-    if (fFlags.bLockEntire)
-    {
-        offLock = 0;
-        DdiLock.Flags.Value = 0;
-        DdiLock.Flags.LockEntire = 1;
-    }
-    else
-    {
-        if (!cbLock)
-        {
-            Assert(0);
-            return VERR_INVALID_PARAMETER;
-        }
-        if (offLock + cbLock > pBuf->cbBuffer)
-        {
-            Assert(0);
-            return VERR_INVALID_PARAMETER;
-        }
-
-        uint32_t iFirstPage = offLock >> 0x1000;
-        uint32_t iAfterLastPage = (cbLock + 0xfff) >> 0x1000;
-        uint32_t cPages = iAfterLastPage - iFirstPage;
-        uint32_t cBufPages = pBuf->cbBuffer >> 0x1000;
-        Assert(cPages <= (cBufPages));
-
-        if (cPages == cBufPages)
-        {
-            DdiLock.NumPages = 0;
-            DdiLock.pPages = NULL;
-            DdiLock.Flags.Value = 0;
-            DdiLock.Flags.LockEntire = 1;
-        }
-        else
-        {
-            DdiLock.NumPages = cPages;
-            DdiLock.pPages = pBuffer->aLockPageIndices;
-            DdiLock.Flags.Value = 0;
-            for (UINT i = 0, j = iFirstPage; i < cPages; ++i, ++j)
-            {
-                pBuffer->aLockPageIndices[i] = j;
-            }
-        }
-
-    }
-    DdiLock.pData = NULL;
-    DdiLock.Flags.ReadOnly = fFlags.bReadOnly;
-    DdiLock.Flags.WriteOnly = fFlags.bWriteOnly;
-    DdiLock.Flags.DonotWait = fFlags.bDonotWait;
-//    DdiLock.Flags.Discard = fFlags.bDiscard;
+    int rc = vboxUhgsmiBaseLockData(pBuf, offLock, cbLock, fFlags,
+                                         &DdiLock.Flags, pBuffer->aLockPageIndices, &DdiLock.NumPages);
+    AssertRC(rc);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    DdiLock.pPages = pBuffer->aLockPageIndices;
 
     HRESULT hr = pBuffer->pDevice->RtCallbacks.pfnLockCb(pBuffer->pDevice->hDevice, &DdiLock);
@@ -123 +80 @@
     D3DDDICB_UNLOCK DdiUnlock;
     DdiUnlock.NumAllocations = 1;
-    DdiUnlock.phAllocations = &pBuffer->hAllocation;
+    DdiUnlock.phAllocations = &pBuffer->BasePrivate.hAllocation;
     HRESULT hr = pBuffer->pDevice->RtCallbacks.pfnUnlockCb(pBuffer->pDevice->hDevice, &DdiUnlock);
     Assert(hr == S_OK);
@@ -139 +96 @@
         return VERR_INVALID_PARAMETER;
 
-    switch (enmSynchType)
-    {
-        case VBOXUHGSMI_SYNCHOBJECT_TYPE_EVENT:
-            if (!hSynch)
-            {
-                hSynch = CreateEvent(
-                  NULL, /* LPSECURITY_ATTRIBUTES lpEventAttributes */
-                  FALSE, /* BOOL bManualReset */
-                  FALSE, /* BOOL bInitialState */
-                  NULL /* LPCTSTR lpName */
-                );
-                Assert(hSynch);
-                if (!hSynch)
-                {
-                    DWORD winEr = GetLastError();
-                    /* todo: translate winer */
-                    return VERR_GENERAL_FAILURE;
-                }
-                bSynchCreated = true;
-            }
-            break;
-        case VBOXUHGSMI_SYNCHOBJECT_TYPE_SEMAPHORE:
-            if (!hSynch)
-            {
-                hSynch = CreateSemaphore(
-                  NULL, /* LPSECURITY_ATTRIBUTES lpSemaphoreAttributes */
-                  0, /* LONG lInitialCount */
-                  ~0L, /* LONG lMaximumCount */
-                  NULL /* LPCTSTR lpName */
-                );
-                Assert(hSynch);
-                if (!hSynch)
-                {
-                    DWORD winEr = GetLastError();
-                    /* todo: translate winer */
-                    return VERR_GENERAL_FAILURE;
-                }
-                bSynchCreated = true;
-            }
-            break;
-        default:
-            Assert(0);
-            return VERR_INVALID_PARAMETER;
-    }
+    int rc = vboxUhgsmiBaseEventChkCreate(enmSynchType, &hSynch, &bSynchCreated);
+    AssertRC(rc);
+    if (RT_FAILURE(rc))
+        return rc;
 
     cbBuf = VBOXWDDM_ROUNDBOUND(cbBuf, 0x1000);
@@ -189 +106 @@
     Assert(cPages);
 
-    int rc;
     PVBOXUHGSMI_PRIVATE_D3D pPrivate = VBOXUHGSMID3D_GET(pHgsmi);
     PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuf = (PVBOXUHGSMI_BUFFER_PRIVATE_D3D)RTMemAllocZ(RT_OFFSETOF(VBOXUHGSMI_BUFFER_PRIVATE_D3D, aLockPageIndices));
@@ -218 +134 @@
         {
             Assert(Buf.DdiAllocInfo.hAllocation);
-            pBuf->Base.pfnLock = vboxUhgsmiD3DBufferLock;
-            pBuf->Base.pfnUnlock = vboxUhgsmiD3DBufferUnlock;
+            pBuf->BasePrivate.Base.pfnLock = vboxUhgsmiD3DBufferLock;
+            pBuf->BasePrivate.Base.pfnUnlock = vboxUhgsmiD3DBufferUnlock;
 //            pBuf->Base.pfnAdjustValidDataRange = vboxUhgsmiD3DBufferAdjustValidDataRange;
-            pBuf->Base.pfnDestroy = vboxUhgsmiD3DBufferDestroy;
-
-            pBuf->Base.hSynch = hSynch;
-            pBuf->Base.enmSynchType =enmSynchType;
-            pBuf->Base.cbBuffer = cbBuf;
-            pBuf->Base.bSynchCreated = bSynchCreated;
+            pBuf->BasePrivate.Base.pfnDestroy = vboxUhgsmiD3DBufferDestroy;
+
+            pBuf->BasePrivate.Base.hSynch = hSynch;
+            pBuf->BasePrivate.Base.enmSynchType = enmSynchType;
+            pBuf->BasePrivate.Base.cbBuffer = cbBuf;
+            pBuf->BasePrivate.Base.bSynchCreated = bSynchCreated;
 
             pBuf->pDevice = pPrivate->pDevice;
-            pBuf->hAllocation = Buf.DdiAllocInfo.hAllocation;
-
-            *ppBuf = &pBuf->Base;
+            pBuf->BasePrivate.hAllocation = Buf.DdiAllocInfo.hAllocation;
+
+            *ppBuf = &pBuf->BasePrivate.Base;
 
             return VINF_SUCCESS;
@@ -251 +167 @@
     PVBOXUHGSMI_PRIVATE_D3D pHg = VBOXUHGSMID3D_GET(pHgsmi);
     PVBOXWDDMDISP_DEVICE pDevice = pHg->pDevice;
-    const uint32_t cbDmaCmd = RT_OFFSETOF(VBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD, aBufInfos[cBuffers]);
-    if (pDevice->DefaultContext.ContextInfo.CommandBufferSize < cbDmaCmd)
-    {
-        Assert(0);
-        return VERR_GENERAL_FAILURE;
-    }
-    if (pDevice->DefaultContext.ContextInfo.AllocationListSize < cBuffers)
-    {
-        Assert(0);
-        return VERR_GENERAL_FAILURE;
-    }
-
-    PVBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD pHdr = (PVBOXWDDM_DMA_PRIVATEDATA_UM_CHROMIUM_CMD)pDevice->DefaultContext.ContextInfo.pCommandBuffer;
-    pHdr->Base.enmCmd = VBOXVDMACMD_TYPE_CHROMIUM_CMD;
-    pHdr->Base.u32CmdReserved = cBuffers;
-
-    D3DDDI_ALLOCATIONLIST* pAllocationList = pDevice->DefaultContext.ContextInfo.pAllocationList;
-    PVBOXWDDM_UHGSMI_BUFFER_UI_SUBMIT_INFO pBufSubmInfo = pHdr->aBufInfos;
-
-    for (uint32_t i = 0; i < cBuffers; ++i)
-    {
-        PVBOXUHGSMI_BUFFER_SUBMIT pBufInfo = &aBuffers[i];
-        PVBOXUHGSMI_BUFFER_PRIVATE_D3D pBuffer = VBOXUHGSMID3D_GET_BUFFER(pBufInfo->pBuf);
-
-        memset(pAllocationList, 0, sizeof (D3DDDI_ALLOCATIONLIST));
-        pAllocationList->hAllocation = pBuffer->hAllocation;
-        pAllocationList->WriteOperation = !pBufInfo->fFlags.bHostReadOnly;
-        pAllocationList->DoNotRetireInstance = pBufInfo->fFlags.bDoNotRetire;
-        pBufSubmInfo->fSubFlags = pBufInfo->fFlags;
-        if (pBufInfo->fFlags.bEntireBuffer)
-        {
-            pBufSubmInfo->offData = 0;
-            pBufSubmInfo->cbData = pBuffer->Base.cbBuffer;
-        }
-        else
-        {
-            pBufSubmInfo->offData = pBufInfo->offData;
-            pBufSubmInfo->cbData = pBufInfo->cbData;
-        }
-
-        ++pAllocationList;
-        ++pBufSubmInfo;
-    }
-
+    UINT cbDmaCmd = pDevice->DefaultContext.ContextInfo.CommandBufferSize;
+    int rc = vboxUhgsmiBaseDmaFill(aBuffers, cBuffers,
+            pDevice->DefaultContext.ContextInfo.pCommandBuffer, &cbDmaCmd,
+            pDevice->DefaultContext.ContextInfo.pAllocationList, pDevice->DefaultContext.ContextInfo.AllocationListSize,
+            pDevice->DefaultContext.ContextInfo.pPatchLocationList, pDevice->DefaultContext.ContextInfo.PatchLocationListSize);
+    AssertRC(rc);
+    if (RT_FAILURE(rc))
+        return rc;
 
     D3DDDICB_RENDER DdiRender = {0};
@@ -327 +207 @@
 HRESULT vboxUhgsmiD3DInit(PVBOXUHGSMI_PRIVATE_D3D pHgsmi, PVBOXWDDMDISP_DEVICE pDevice)
 {
-    pHgsmi->Base.pfnBufferCreate = vboxUhgsmiD3DBufferCreate;
-    pHgsmi->Base.pfnBufferSubmitAsynch = vboxUhgsmiD3DBufferSubmitAsynch;
+    pHgsmi->BasePrivate.Base.pfnBufferCreate = vboxUhgsmiD3DBufferCreate;
+    pHgsmi->BasePrivate.Base.pfnBufferSubmitAsynch = vboxUhgsmiD3DBufferSubmitAsynch;
+    pHgsmi->BasePrivate.hClient = NULL;
     pHgsmi->pDevice = pDevice;
     return S_OK;
 }
+

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiDisp.h

@@ -16 +16 @@
 #define ___VBoxUhgsmiDisp_h__
 
-#include "../../Miniport/wddm/VBoxUhgsmi.h"
+#include "VBoxUhgsmiBase.h"
 #include "VBoxDispD3DCmn.h"
 
 typedef struct VBOXUHGSMI_PRIVATE_D3D
 {
-    VBOXUHGSMI Base;
+    VBOXUHGSMI_PRIVATE_BASE BasePrivate;
     struct VBOXWDDMDISP_DEVICE *pDevice;
 } VBOXUHGSMI_PRIVATE_D3D, *PVBOXUHGSMI_PRIVATE_D3D;
 
 HRESULT vboxUhgsmiD3DInit(PVBOXUHGSMI_PRIVATE_D3D pHgsmi, struct VBOXWDDMDISP_DEVICE *pDevice);
+
+
+
 #endif /* #ifndef ___VBoxUhgsmiDisp_h__ */

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
 {