Zhiyi Zhang : wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3635e09dd51ae37331c1a33236bd026a36ffbef8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3635e09dd51ae37331c1a33236bd026a36ffbef8

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Fri Mar  6 21:16:02 2020 +0800

wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_display_mode().

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/swapchain.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 312e8f2d24..65935a6165 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -1430,19 +1430,19 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha
 }
 
 static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain_state *state,
-        struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode)
+        struct wined3d *wined3d, struct wined3d_output *output, struct wined3d_display_mode *mode)
 {
     HRESULT hr;
 
     if (state->desc.flags & WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE)
     {
-        if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, adapter_idx, mode)))
+        if (FAILED(hr = wined3d_find_closest_matching_adapter_mode(wined3d, 0, mode)))
         {
             WARN("Failed to find closest matching mode, hr %#x.\n", hr);
         }
     }
 
-    if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, adapter_idx, mode)))
+    if (FAILED(hr = wined3d_set_adapter_display_mode(wined3d, 0, mode)))
     {
         WARN("Failed to set display mode, hr %#x.\n", hr);
         return WINED3DERR_INVALIDCALL;
@@ -1480,7 +1480,8 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta
     else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH)
     {
         actual_mode = *mode;
-        if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode)))
+        if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output,
+                &actual_mode)))
         {
             wined3d_mutex_unlock();
             return hr;
@@ -1649,7 +1650,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st
             }
         }
 
-        if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode)))
+        if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, output,
+                &actual_mode)))
             return hr;
     }
     else