Changeset 45403 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Apr 8, 2013 1:00:36 PM (12 years ago)

Author:

vboxsync

Message:

wddm/3d: cmd API only 3D contexts

Location:

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

Files:

• disp/wddm/VBoxDispCm.cpp (modified) (1 diff)
• mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)

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

@@ -207 +207 @@
 
     pCmd->EscapeHdr.escapeCode = VBOXESC_GETVBOXVIDEOCMCMD;
+
+    PVBOXWDDMDISP_CONTEXT pContext = NULL, pCurCtx;
+
     /* lock to ensure the context is not destroyed */
     EnterCriticalSection(&pSession->CritSect);
     /* use any context for identifying the kernel CmSession. We're using the first one */
-    PVBOXWDDMDISP_CONTEXT pContext = RTListGetFirst(&pSession->CtxList, VBOXWDDMDISP_CONTEXT, ListNode);
+    RTListForEach(&pSession->CtxList, pCurCtx, VBOXWDDMDISP_CONTEXT, ListNode)
+    {
+        PVBOXWDDMDISP_DEVICE pDevice = pCurCtx->pDevice;
+        if (VBOXDISPMODE_IS_3D(pDevice->pAdapter))
+        {
+            pContext = pCurCtx;
+            break;
+        }
+    }
     if (pContext)
     {

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

@@ -4024 +4024 @@
                 if (pEscape->PrivateDriverDataSize >= sizeof (VBOXDISPIFESCAPE_GETVBOXVIDEOCMCMD))
                 {
-                    Status = vboxVideoCmEscape(&pContext->CmContext, pRegions, pEscape->PrivateDriverDataSize);
-                    Assert(Status == STATUS_SUCCESS);
+                    if (pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D)
+                    {
+                        Status = vboxVideoCmEscape(&pContext->CmContext, pRegions, pEscape->PrivateDriverDataSize);
+                        Assert(Status == STATUS_SUCCESS);
+                    }
+                    else
+                    {
+                        WARN(("VBOXESC_GETVBOXVIDEOCMCMD recieved invalid context type %d", pContext->enmType));
+                        Status = STATUS_INVALID_PARAMETER;
+                    }
                 }
                 else