Changeset 72010 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

Timestamp:

Apr 25, 2018 10:45:46 AM (7 years ago)

Author:

vboxsync

Message:

WDDM: VBoxDispD3D: D3D backend creation cleanup.

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp (modified) (6 diffs)

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

@@ -460 +460 @@
 #endif
 
-static BOOLEAN vboxWddmDalCheckNotifyRemove(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_ALLOCATION pAlloc)
+BOOLEAN vboxWddmDalCheckNotifyRemove(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_ALLOCATION pAlloc)
 {
     if (pAlloc->DirtyAllocListEntry.pNext)
@@ -551 +551 @@
 }
 
-static VOID vboxWddmDalCheckAddOnDraw(PVBOXWDDMDISP_DEVICE pDevice)
+VOID vboxWddmDalCheckAddOnDraw(PVBOXWDDMDISP_DEVICE pDevice)
 {
     vboxWddmDalCheckAddRTs(pDevice);
@@ -5797 +5797 @@
         if (pDevice->pDevice9If)
         {
-            if (pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9Term)
+            if (pDevice->pAdapter->enmHwType == VBOXVIDEO_HWTYPE_CROGL)
                 pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9Term((IDirect3DDevice9Ex *)pDevice->pDevice9If);
         }
@@ -6595 +6595 @@
     if (SUCCEEDED(hr))
     {
-
         hr = vboxDispAdapterInit(pOpenData, pAdapterInfo, &pAdapter);
         if (SUCCEEDED(hr))
@@ -6605 +6604 @@
 
                 /* Try enable the 3D. */
-                hr = VBoxDispD3DGlobalOpen(&pAdapter->D3D, &pAdapter->Formats);
+                hr = VBoxDispD3DGlobalOpen(&pAdapter->D3D, &pAdapter->Formats, &pAdapter->AdapterInfo);
                 if (hr == S_OK)
                 {
@@ -6611 +6610 @@
 
                     /* Flag indicating that the adapter instance is running in 3D mode. */
-                    pAdapter->f3D = (pAdapter->D3D.pD3D9If != NULL);
+                    pAdapter->f3D = true;
                 }
                 else