wined3d: Do not switch display mode when windowed is TRUE.

Fixes a regression introduced by commit cad27944. Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Do not switch display mode when windowed is TRUE.
910fc594 · Józef Kucia · Alexandre Julliard · bdd7be37 · 910fc594
Commit 910fc594 authored Aug 15, 2016 by Józef Kucia Committed by Alexandre Julliard Aug 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

device.c dlls/wined3d/device.c +5 -2

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4648,6 +4648,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
    struct wined3d_rendertarget_view_desc view_desc;
    struct wined3d_resource *resource, *cursor;
    struct wined3d_swapchain *swapchain;
+    BOOL backbuffer_resized;
    HRESULT hr = WINED3D_OK;
    unsigned int i;

@@ -4737,10 +4738,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
        wined3d_swapchain_set_window(swapchain, NULL);
    }

+    backbuffer_resized = swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width
+            || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height;
+
    if (!swapchain_desc->windowed != !swapchain->desc.windowed
            || swapchain->reapply_mode || mode
-            || swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width
-            || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height)
+            || (!swapchain_desc->windowed && backbuffer_resized))
    {
        if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain, swapchain_desc, mode)))
            return hr;