Changeset 106452 in vbox for trunk/src/VBox/Additions/3D

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165271

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/3D/win

Files:

• VBoxGL/GaDrvEnvKMT.cpp (modified) (2 diffs)
• VBoxICD/VBoxICD.c (modified) (2 diffs)
• VBoxWddmUmHlp/D3DKMT.cpp (modified) (2 diffs)
• VBoxWddmUmHlp/VBoxMpLogger.cpp (modified) (2 diffs)
• VBoxWddmUmHlp/VBoxWddmUmHlp.h (modified) (1 diff)

trunk/src/VBox/Additions/3D/win/VBoxGL/GaDrvEnvKMT.cpp

@@ -1274 +1274 @@
 
     /* Figure out which adapter to use. */
-    NTSTATUS Status = vboxDispKmtOpenAdapter2(&mKmtCallbacks.hAdapter, &mKmtCallbacks.AdapterLuid);
+    NTSTATUS Status = VBoxWddmKmtOpenAdapter2(&mKmtCallbacks.hAdapter, &mKmtCallbacks.AdapterLuid);
     Assert(Status == STATUS_SUCCESS);
     if (Status == STATUS_SUCCESS)
@@ -1298 +1298 @@
         }
 
-        vboxDispKmtCloseAdapter(mKmtCallbacks.hAdapter);
+        VBoxWddmKmtCloseAdapter(mKmtCallbacks.hAdapter);
     }
 

trunk/src/VBox/Additions/3D/win/VBoxICD/VBoxICD.c

@@ -84 +84 @@
     D3DKMTLoad();
 
-    Status = vboxDispKmtOpenAdapter(&hAdapter);
+    Status = VBoxWddmKmtOpenAdapter(&hAdapter);
     if (Status == STATUS_SUCCESS)
     {
@@ -109 +109 @@
         }
 
-        vboxDispKmtCloseAdapter(hAdapter);
+        VBoxWddmKmtCloseAdapter(hAdapter);
     }
 }

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/D3DKMT.cpp

@@ -228 +228 @@
 }
 
-NTSTATUS vboxDispKmtOpenAdapter2(D3DKMT_HANDLE *phAdapter, LUID *pLuid)
+NTSTATUS VBoxWddmKmtOpenAdapter2(D3DKMT_HANDLE *phAdapter, LUID *pLuid)
 {
     NTSTATUS Status = vboxDispKmtOpenAdapterFromLuid(phAdapter, pLuid);
@@ -240 +240 @@
 }
 
-NTSTATUS vboxDispKmtOpenAdapter(D3DKMT_HANDLE *phAdapter)
-{
-    return vboxDispKmtOpenAdapter2(phAdapter, NULL);
-}
-
-NTSTATUS vboxDispKmtCloseAdapter(D3DKMT_HANDLE hAdapter)
+NTSTATUS VBoxWddmKmtOpenAdapter(D3DKMT_HANDLE *phAdapter)
+{
+    return VBoxWddmKmtOpenAdapter2(phAdapter, NULL);
+}
+
+NTSTATUS VBoxWddmKmtCloseAdapter(D3DKMT_HANDLE hAdapter)
 {
     D3DKMTFUNCTIONS const *d3dkmt = D3DKMTFunctions();

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxMpLogger.cpp

@@ -53 +53 @@
 
     D3DKMT_HANDLE hAdapter;
-    NTSTATUS Status = vboxDispKmtOpenAdapter(&hAdapter);
+    NTSTATUS Status = VBoxWddmKmtOpenAdapter(&hAdapter);
     Assert(Status == STATUS_SUCCESS);
     if (Status == 0)
@@ -84 +84 @@
         }
 
-        Status = vboxDispKmtCloseAdapter(hAdapter);
+        Status = VBoxWddmKmtCloseAdapter(hAdapter);
         Assert(Status == STATUS_SUCCESS);
     }

trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/VBoxWddmUmHlp.h

@@ -107 +107 @@
 DECLCALLBACK(void) VBoxWddmUmLog(const char *pszString);
 
-/** @todo Rename to VBoxWddm* */
-NTSTATUS vboxDispKmtOpenAdapter2(D3DKMT_HANDLE *phAdapter, LUID *pLuid);
-NTSTATUS vboxDispKmtOpenAdapter(D3DKMT_HANDLE *phAdapter);
-NTSTATUS vboxDispKmtCloseAdapter(D3DKMT_HANDLE hAdapter);
+NTSTATUS VBoxWddmKmtOpenAdapter2(D3DKMT_HANDLE *phAdapter, LUID *pLuid);
+NTSTATUS VBoxWddmKmtOpenAdapter(D3DKMT_HANDLE *phAdapter);
+NTSTATUS VBoxWddmKmtCloseAdapter(D3DKMT_HANDLE hAdapter);
 
 RT_C_DECLS_END