wined3d: Restore display mode for the previous output before changing to another output.

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

wined3d: Restore display mode for the previous output before changing to another output.
b6495fa3 · Zhiyi Zhang · Alexandre Julliard · 7962c319 · b6495fa3
Commit b6495fa3 authored May 15, 2020 by Zhiyi Zhang Committed by Alexandre Julliard May 18, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

swapchain.c dlls/wined3d/swapchain.c +15 -0

No files found.
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -1434,6 +1434,21 @@ static HRESULT wined3d_swapchain_state_set_display_mode(struct wined3d_swapchain
        }
    }

+    if (output != state->desc.output)
+    {
+        if (FAILED(hr = wined3d_output_set_display_mode(state->desc.output, &state->original_mode)))
+        {
+            WARN("Failed to set display mode, hr %#x.\n", hr);
+            return hr;
+        }
+
+        if (FAILED(hr = wined3d_output_get_display_mode(output, &state->original_mode, NULL)))
+        {
+            WARN("Failed to get current display mode, hr %#x.\n", hr);
+            return hr;
+        }
+    }
+
    if (FAILED(hr = wined3d_output_set_display_mode(output, mode)))
    {
        WARN("Failed to set display mode, hr %#x.\n", hr);