Changeset 70052 in vbox

Timestamp:

Dec 10, 2017 10:10:01 PM (7 years ago)

Author:

vboxsync

Message:

WDDM: more 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) (1 diff)
• VBoxDispD3D.h (modified) (2 diffs)

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

@@ -56 +56 @@
     }
 
-    return vboxD3DIfCreateSharedPrimary(pAlloc);
+    Assert(pAlloc->pRc->pDevice->pfnCreateSharedPrimary);
+    return pAlloc->pRc->pDevice->pfnCreateSharedPrimary(pAlloc);
 }
 
@@ -130 +131 @@
 #endif
 
+    Assert(pDevice->pfnCreateDirect3DDevice);
     HRESULT hr = pDevice->pfnCreateDirect3DDevice(pDevice);
     Assert(hr == S_OK); NOREF(hr);

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

@@ -6306 +6306 @@
         pDevice->cRTs = pAdapter->D3D.cMaxSimRTs;
         pDevice->pfnCreateDirect3DDevice = VBoxD3DIfDeviceCreateDummy;
+        pDevice->pfnCreateSharedPrimary  = vboxD3DIfCreateSharedPrimary;
         pDevice->hDevice = pCreateData->hDevice;
         pDevice->pAdapter = pAdapter;

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

@@ -184 +184 @@
 typedef FNVBOXWDDMCREATEDIRECT3DDEVICE *PFNVBOXWDDMCREATEDIRECT3DDEVICE;
 
+typedef IUnknown* FNVBOXWDDMCREATESHAREDPRIMARY(struct VBOXWDDMDISP_ALLOCATION *pAlloc);
+typedef FNVBOXWDDMCREATESHAREDPRIMARY *PFNVBOXWDDMCREATESHAREDPRIMARY;
+
 typedef struct VBOXWDDMDISP_DEVICE
 {
@@ -189 +192 @@
     PVBOXWDDMDISP_ADAPTER pAdapter;
     PFNVBOXWDDMCREATEDIRECT3DDEVICE pfnCreateDirect3DDevice;
+    PFNVBOXWDDMCREATESHAREDPRIMARY pfnCreateSharedPrimary;
     IDirect3DDevice9 *pDevice9If;
     RTLISTANCHOR SwapchainList;