ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Do not attempt to restore GL contexts corresponding to wined3d contexts in wined3d_context_gl_cleanup(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-09-10 21:32:47 +02:00 committed by Alexandre Julliard
parent 0c92fa4472
commit b535dea0aa
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/wined3d/context_gl.c
View File

@ -1347,6 +1347,7 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl)
struct wined3d_so_statistics_query *so_statistics_query;
struct wined3d_timestamp_query *timestamp_query;
struct wined3d_occlusion_query *occlusion_query;
struct wined3d_context_gl *current;
struct fbo_entry *entry, *entry2;
struct wined3d_fence *fence;
HGLRC restore_ctx;
@ -1356,10 +1357,22 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl)
restore_ctx = wglGetCurrentContext();
restore_dc = wglGetCurrentDC();
if (restore_ctx == context_gl->gl_ctx)
restore_ctx = NULL;
else if (context_gl->valid)
if (context_gl->valid && context_gl->gl_ctx != restore_ctx)
{
/* Attempting to restore a GL context corresponding to a wined3d
* context is not particularly useful. Worse, when we're called from
* wined3d_context_gl_destroy(), we subsequently clear the "current
* D3D context" TLS value, which would cause
* wined3d_context_gl_enter() to consider the GL context a non-D3D
* context. */
if ((current = wined3d_context_gl_get_current()) && current->gl_ctx == restore_ctx)
restore_ctx = NULL;
wined3d_context_gl_set_gl_context(context_gl);
}
else
{
restore_ctx = NULL;
}
if (context_gl->valid)
{