From 9a373586a36e3702414e2d50814db78d9c9fbbc2 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 7 May 2019 15:00:07 +0430 Subject: [PATCH] wined3d: Share more swapchain setup with the "no3d" adapter in wined3d_device_set_implicit_swapchain(). Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/wined3d/device.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2dbb403932..dcf05f054f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1151,24 +1151,25 @@ 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"); - - /* 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->d3d_initialized = TRUE; - - if (wined3d_settings.logo) - device_load_logo(device, wined3d_settings.logo); } + device_init_swapchain_state(device, swapchain); + + TRACE("All defaults now set up.\n"); + + /* 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; err_out: