Changeset 106452 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Oct 17, 2024 1:45:57 PM (3 months ago)

Author:

vboxsync

Message:

Additions/VBoxTray: Kicked it to make it build with VBOX_WITH_WDDM=. That code area needs a major cleanup for better separation and interfacing later. Untested. bugref:10792

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared

Files:

• VBoxDispKmt.cpp (modified) (2 diffs)
• VBoxDispKmt.h (modified) (1 diff)
• VBoxDispMpLogger.cpp (modified) (5 diffs)

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

@@ -306 +306 @@
 }
 
-HRESULT vboxDispKmtOpenAdapter(const VBOXDISPKMT_CALLBACKS *pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter)
+HRESULT VBoxWddmKmtOpenAdapter(const VBOXDISPKMT_CALLBACKS *pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter)
 {
     HRESULT hr = vboxDispKmtOpenAdapterViaHdc(pCallbacks, pAdapter);
@@ -319 +319 @@
 }
 
-HRESULT vboxDispKmtCloseAdapter(PVBOXDISPKMT_ADAPTER pAdapter)
+HRESULT VBoxWddmKmtCloseAdapter(PVBOXDISPKMT_ADAPTER pAdapter)
 {
     D3DKMT_CLOSEADAPTER ClosaAdapterData = {0};

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

@@ -148 +148 @@
 HRESULT vboxDispKmtCallbacksTerm(PVBOXDISPKMT_CALLBACKS pCallbacks);
 
-HRESULT vboxDispKmtOpenAdapter(const VBOXDISPKMT_CALLBACKS *pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter);
-HRESULT vboxDispKmtCloseAdapter(PVBOXDISPKMT_ADAPTER pAdapter);
+HRESULT VBoxWddmKmtOpenAdapter(const VBOXDISPKMT_CALLBACKS *pCallbacks, PVBOXDISPKMT_ADAPTER pAdapter);
+HRESULT VBoxWddmKmtCloseAdapter(PVBOXDISPKMT_ADAPTER pAdapter);
 HRESULT vboxDispKmtCreateDevice(PVBOXDISPKMT_ADAPTER pAdapter, PVBOXDISPKMT_DEVICE pDevice);
 HRESULT vboxDispKmtDestroyDevice(PVBOXDISPKMT_DEVICE pDevice);

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

@@ -78 +78 @@
              * check if we can Open Adapter, i.e. WDDM driver is installed */
             VBOXDISPKMT_ADAPTER Adapter;
-            hr = vboxDispKmtOpenAdapter(&g_VBoxDispMpLogger.KmtCallbacks, &Adapter);
+            hr = VBoxWddmKmtOpenAdapter(&g_VBoxDispMpLogger.KmtCallbacks, &Adapter);
             if (hr == S_OK)
             {
                 ASMAtomicWriteU32((volatile uint32_t *)&g_VBoxDispMpLogger.enmState, VBOXDISPMPLOGGER_STATE_INITIALIZED);
-                vboxDispKmtCloseAdapter(&Adapter);
+                VBoxWddmKmtCloseAdapter(&Adapter);
                 return &g_VBoxDispMpLogger;
             }
@@ -125 +125 @@
 
     VBOXDISPKMT_ADAPTER Adapter;
-    HRESULT hr = vboxDispKmtOpenAdapter(&pLogger->KmtCallbacks, &Adapter);
+    HRESULT hr = VBoxWddmKmtOpenAdapter(&pLogger->KmtCallbacks, &Adapter);
     if (hr == S_OK)
     {
@@ -157 +157 @@
             BP_WARN();
         }
-        hr = vboxDispKmtCloseAdapter(&Adapter);
+        hr = VBoxWddmKmtCloseAdapter(&Adapter);
         if(hr != S_OK)
         {
@@ -193 +193 @@
 
     VBOXDISPKMT_ADAPTER Adapter;
-    HRESULT hr = vboxDispKmtOpenAdapter(&pLogger->KmtCallbacks, &Adapter);
+    HRESULT hr = VBoxWddmKmtOpenAdapter(&pLogger->KmtCallbacks, &Adapter);
     if (hr == S_OK)
     {
@@ -228 +228 @@
             BP_WARN();
         }
-        hr = vboxDispKmtCloseAdapter(&Adapter);
+        hr = VBoxWddmKmtCloseAdapter(&Adapter);
         if(hr != S_OK)
         {