Changeset 32461 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c

Timestamp:

Sep 13, 2010 5:59:01 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine multi-swapchain fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c (modified) (3 diffs)

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

@@ -462 +462 @@
     return ret;
 }
-
+#ifdef VBOXWDDM
+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;
@@ -493 +497 @@
     return D3D_OK;
 }
+
+#ifdef VBOXWDDM
+static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
+        D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
+{
+    IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
+    IDirect3DSwapChain9Impl *newSwapchain;
+    HRESULT hr = IDirect3DDevice9Impl_DoCreateAdditionalSwapChain(iface, present_parameters, &newSwapchain);
+    if (FAILED(hr))
+    {
+        ERR("Failed to create additional swapchain, hr %#x.\n", hr);
+        return hr;
+    }
+
+    /* add swapchain to the swapchain list */
+    wined3d_mutex_lock();
+    hr = IWineD3DDevice_AddSwapChain(This->WineD3DDevice, newSwapchain->wineD3DSwapChain);
+    wined3d_mutex_unlock();
+    if (FAILED(hr))
+    {
+        ERR("Failed to add additional swapchain, hr %#x.\n", hr);
+        IUnknown_Release(newSwapchain);
+        return hr;
+    }
+
+    *swapchain = (IDirect3DSwapChain9 *)newSwapchain;
+    return D3D_OK;
+}
+#endif
 
 static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data) {
@@ -2898 +2931 @@
     local_parameters.PresentationInterval = present_parameters->PresentationInterval;
 
+#ifdef VBOXWDDM
+    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))
     {