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 fabde842ede40fc53cf6f5743d5b477841f7b11c.

Browse Source
This commit is contained in:
Zebediah Figura
2019-04-12 19:34:16 -05:00
parent 8f56ffcf57
commit a36ea2ace3
4 changed files with 143 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,24 +1,27 @@
From 25629ab322f251afa9ae5495212c84a00f5af00f Mon Sep 17 00:00:00 2001
From 657f0e0b86c4b3f2fad5e5bd893ba104fb6bdf7f 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 | 1 +
1 file changed, 1 insertion(+)
dlls/wined3d/device.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index aa24d7f4c37..1bf7db30b3d 100644
index 361ac6b1e..44c51833c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1200,6 +1200,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device)
@@ -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);
+ }
wine_rb_clear(&device->samplers, device_free_sampler, NULL);
+ context_set_current(NULL);
wined3d_device_delete_opengl_contexts(device);
if (device->fb.depth_stencil)
if ((view = device->fb.depth_stencil))
{
--
2.11.0
2.21.0

7
patches/wined3d-CSMT_Main/definition
View File

@@ -1,7 +0,0 @@
Depends: wined3d-Accounting
Depends: wined3d-DXTn
Depends: wined3d-Silence_FIXMEs
Depends: wined3d-UAV_Counters
Depends: wined3d-Dual_Source_Blending
Depends: d3d9-Tests
Depends: d3d11-Deferred_Context