Matteo Bruni : wined3d: Cleanup stateblock state before enumerating resources.

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Mon Feb 11 18:21:03 2019 +0100

wined3d: Cleanup stateblock state before enumerating resources.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46617
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46618
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 1b2f7e0..b823ada 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4894,6 +4894,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
             wined3d_texture_decref(device->cursor_texture);
             device->cursor_texture = NULL;
         }
+        wined3d_stateblock_state_cleanup(&device->stateblock_state);
         state_unbind_resources(&device->state);
     }
 
@@ -5082,7 +5083,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
         }
         wined3d_cs_emit_reset_state(device->cs);
         state_cleanup(&device->state);
-        wined3d_stateblock_state_cleanup(&device->stateblock_state);
 
         if (device->d3d_initialized)
             wined3d_device_delete_opengl_contexts(device);