wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 622422e67bfd9da487102aee4ca42681a24a8e65.

Browse Source
This commit is contained in:
Zebediah Figura
2019-05-07 19:52:35 -05:00
parent 29db3393bc
commit 770269393f
3 changed files with 18 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
patches/wined3d-CSMT_Main/0042-wined3d-Reset-context-before-destruction.patch
View File

@@ -1,27 +1,24 @@
From 657f0e0b86c4b3f2fad5e5bd893ba104fb6bdf7f Mon Sep 17 00:00:00 2001
From 7e7ce73cacdefd54003b4b97dc295c5be2f36f8f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 19 Feb 2017 08:29:23 +0100
Subject: wined3d: Reset context before destruction.
---
dlls/wined3d/device.c | 3 +++
1 file changed, 3 insertions(+)
dlls/wined3d/adapter_gl.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 361ac6b1e..44c51833c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1211,7 +1211,10 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
if (no3d)
device->blitter->ops->blitter_destroy(device->blitter, NULL);
else
+ {
+ context_set_current(NULL);
wined3d_device_delete_opengl_contexts(device);
+ }
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 1f4ba793e..a39c78424 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -4595,6 +4595,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device)
{
TRACE("device %p.\n", device);
if ((view = device->fb.depth_stencil))
{
+ context_set_current(NULL);
wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device);
wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT);
}
--
2.21.0