Henri Verbeet : wined3d: Share more swapchain setup with the "no3d" adapter in wined3d_device_set_implicit_swapchain().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue May  7 15:18:07 2019 +0430

wined3d: Share more swapchain setup with the "no3d" adapter in wined3d_device_set_implicit_swapchain().

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/device.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index b2dbb40..dcf05f0 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1151,23 +1151,24 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str
     {
         if (FAILED(hr = wined3d_device_create_primary_opengl_context(device)))
             goto err_out;
-        device_init_swapchain_state(device, swapchain);
 
-        TRACE("All defaults now set up.\n");
+        device->d3d_initialized = TRUE;
+    }
 
-        /* Clear the screen */
-        if (device->back_buffer_view)
-            clear_flags |= WINED3DCLEAR_TARGET;
-        if (swapchain_desc->enable_auto_depth_stencil)
-            clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL;
-        if (clear_flags)
-            wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0);
+    device_init_swapchain_state(device, swapchain);
 
-        device->d3d_initialized = TRUE;
+    TRACE("All defaults now set up.\n");
 
-        if (wined3d_settings.logo)
-            device_load_logo(device, wined3d_settings.logo);
-    }
+    /* Clear the screen. */
+    if (device->back_buffer_view)
+        clear_flags |= WINED3DCLEAR_TARGET;
+    if (swapchain_desc->enable_auto_depth_stencil)
+        clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL;
+    if (clear_flags)
+        wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0);
+
+    if (wined3d_settings.logo)
+        device_load_logo(device, wined3d_settings.logo);
 
     return WINED3D_OK;