Changeset 70051 in vbox

Timestamp:

Dec 10, 2017 8:02:31 PM (7 years ago)

Author:

vboxsync

Message:

WDDM: minor changes to make the code more generic

Location:

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

Files:

• VBoxD3DIf.h (modified) (2 diffs)
• VBoxDispD3D.cpp (modified) (4 diffs)
• VBoxDispD3D.h (modified) (2 diffs)

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

@@ -130 +130 @@
 #endif
 
-    HRESULT hr = VBoxD3DIfDeviceCreateDummy(pDevice);
+    HRESULT hr = pDevice->pfnCreateDirect3DDevice(pDevice);
     Assert(hr == S_OK); NOREF(hr);
     Assert(pDevice->pDevice9If);
@@ -136 +136 @@
 }
 
-#define VBOXDISPMODE_IS_3D(_p) (!!((_p)->D3D.pD3D9If))
+#define VBOXDISPMODE_IS_3D(_p) ((_p)->f3D)
 #ifdef VBOXDISP_EARLYCREATEDEVICE
 #define VBOXDISP_D3DEV(_p) (_p)->pDevice9If

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

@@ -61 +61 @@
     void postProcess()
     {
-        if (m_pDevice->pDevice9If)
+        if (m_pDevice->pDevice9If && m_pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9Finish)
             m_pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9Finish((IDirect3DDevice9Ex *)m_pDevice->pDevice9If);
     }
@@ -5881 +5881 @@
          * Release may not work in case of some leaking, which will leave the crOgl context refering the destroyed VBOXUHGSMI */
         if (pDevice->pDevice9If)
-            pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9Term((IDirect3DDevice9Ex *)pDevice->pDevice9If);
+        {
+            if (pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9Term)
+                pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9Term((IDirect3DDevice9Ex *)pDevice->pDevice9If);
+        }
     }
 
@@ -6302 +6305 @@
     {
         pDevice->cRTs = pAdapter->D3D.cMaxSimRTs;
+        pDevice->pfnCreateDirect3DDevice = VBoxD3DIfDeviceCreateDummy;
         pDevice->hDevice = pCreateData->hDevice;
         pDevice->pAdapter = pAdapter;
@@ -6704 +6708 @@
                 }
             } while (0);
+
+            /* Flag indicating that the adapter instance is running in 3D mode. */
+            pAdapter->f3D = (pAdapter->D3D.pD3D9If != NULL);
         }
 #ifdef VBOX_WITH_VIDEOHWACCEL

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

@@ -79 +79 @@
     VBOXWDDMDISP_FORMATS Formats;
     uint32_t u32VBox3DCaps;
+    bool f3D;
 #ifdef VBOX_WDDMDISP_WITH_PROFILE
     VBoxDispProfileFpsCounter ProfileDdiFps;
@@ -180 +181 @@
 } VBOXWDDMDISP_SWAPCHAIN, *PVBOXWDDMDISP_SWAPCHAIN;
 
+typedef HRESULT FNVBOXWDDMCREATEDIRECT3DDEVICE(PVBOXWDDMDISP_DEVICE pDevice);
+typedef FNVBOXWDDMCREATEDIRECT3DDEVICE *PFNVBOXWDDMCREATEDIRECT3DDEVICE;
+
 typedef struct VBOXWDDMDISP_DEVICE
 {
     HANDLE hDevice;
     PVBOXWDDMDISP_ADAPTER pAdapter;
+    PFNVBOXWDDMCREATEDIRECT3DDEVICE pfnCreateDirect3DDevice;
     IDirect3DDevice9 *pDevice9If;
     RTLISTANCHOR SwapchainList;