Changeset 39602 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9

Timestamp:

Dec 14, 2011 11:12:17 AM (13 years ago)

Author:

vboxsync

Message:

wine/XPDM: 1. Additional swapchain creation fixes 2. De-libwine'ize wined3d 3. Single context per swapchain 4. wine & crOgl current context sync fixes 5. Proper Get/ReleaseDC handling

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9

Files:

• device.c (modified) (4 diffs)
• directx.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c

@@ -478 +478 @@
     return ret;
 }
-#ifdef VBOX_WITH_WDDM
+
 static HRESULT IDirect3DDevice9Impl_DoCreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
         D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
-#else
-static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
-        D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
-#endif
 {
     IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
@@ -514 +510 @@
 }
 
-#ifdef VBOX_WITH_WDDM
 static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
         D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
@@ -541 +536 @@
     return D3D_OK;
 }
-#endif
 
 static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data) {
@@ -3111 +3105 @@
     local_parameters.PresentationInterval = present_parameters->PresentationInterval;
 
-#ifdef VBOX_WITH_WDDM
     hr = IDirect3DDevice9Impl_DoCreateAdditionalSwapChain((IDirect3DDevice9Ex *)This,
             &local_parameters, (IDirect3DSwapChain9 **)&d3d_swapchain);
-#else
-    hr = IDirect3DDevice9Impl_CreateAdditionalSwapChain((IDirect3DDevice9Ex *)This,
-            &local_parameters, (IDirect3DSwapChain9 **)&d3d_swapchain);
-#endif
     if (FAILED(hr))
     {

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/directx.c

@@ -434 +434 @@
     /* fixup caps  */
 #ifdef VBOX_WITH_WDDM
+    /* needed for Windows Media Player to work properly */
+    pCaps->Caps |= D3DCAPS_READ_SCANLINE;
     pCaps->Caps2 |= 0x00080000 /*D3DCAPS2_CANRENDERWINDOWED*/;
     pCaps->Caps2 |= D3DCAPS2_CANSHARERESOURCE;
@@ -482 +484 @@
 #endif
 
-    /* needed for Windows Media Player to work properly */
-    pCaps->Caps |= D3DCAPS_READ_SCANLINE;
-
     TRACE("(%p) returning %p\n", This, pCaps);