Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in wined3d_device_reset().

Alexandre Julliard julliard at winehq.org
Wed Jun 3 16:40:56 CDT 2020


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Jun  3 15:58:03 2020 +0430

wined3d: Get rid of the "d3d_initialized" check in wined3d_device_reset().

We require an implicit swapchain, so "d3d_initialized" is always true.

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

---

 dlls/wined3d/device.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 9b59371bb2..4544e28bc4 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5385,8 +5385,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
             wined3d_cs_emit_unload_resource(device->cs, resource);
         }
 
-        if (device->d3d_initialized)
-            device->adapter->adapter_ops->adapter_uninit_3d(device);
+        device->adapter->adapter_ops->adapter_uninit_3d(device);
 
         memset(&device->state, 0, sizeof(device->state));
         state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT);
@@ -5403,7 +5402,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
             wined3d_device_set_depth_stencil_view(device, view);
     }
 
-    if (device->d3d_initialized && reset_state)
+    if (reset_state)
         hr = device->adapter->adapter_ops->adapter_init_3d(device);
 
     /* All done. There is no need to reload resources or shaders, this will happen automatically on the




More information about the wine-cvs mailing list