[PATCH 05/10] wined3d: Only delete the GL contexts after unloading resources in wined3d_device_reset().
Henri Verbeet
hverbeet at codeweavers.com
Mon Aug 22 14:02:45 CDT 2011
The updateSurfaceDesc() calls potentially make GL calls.
---
dlls/wined3d/device.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 819e481..0fa385c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5762,8 +5762,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
wined3d_stateblock_decref(device->updateStateBlock);
wined3d_stateblock_decref(device->stateBlock);
- delete_opengl_contexts(device, swapchain);
-
if (present_parameters->Windowed)
{
mode.Width = swapchain->orig_width;
@@ -5819,6 +5817,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
}
}
+ delete_opengl_contexts(device, swapchain);
+
if (!present_parameters->Windowed != !swapchain->presentParms.Windowed
|| DisplayModeChanged)
{
--
1.7.3.4
More information about the wine-patches
mailing list