Zebediah Figura : wined3d: Fully clean up the device state in wined3d_device_uninit_3d().

Alexandre Julliard julliard at winehq.org
Mon Sep 23 15:22:34 CDT 2019


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Sun Sep 22 21:19:30 2019 -0500

wined3d: Fully clean up the device state in wined3d_device_uninit_3d().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/device.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 92259e3ea5..c8fae1275c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -537,8 +537,6 @@ void wined3d_device_cleanup(struct wined3d_device *device)
         ERR("Something's still holding the recording stateblock.\n");
     device->recording = NULL;
 
-    state_cleanup(&device->state);
-
     for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i)
     {
         heap_free(device->multistate_funcs[i]);
@@ -1142,7 +1140,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
         wined3d_texture_decref(texture);
     }
 
-    state_unbind_resources(&device->state);
+    state_cleanup(&device->state);
     for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i)
     {
         wined3d_device_set_rendertarget_view(device, i, NULL, FALSE);




More information about the wine-cvs mailing list