Ken Thomases : wined3d: Don't clear the GL context if it' s not the one being destroyed by context_destroy_gl_resources().
Alexandre Julliard
julliard at winehq.org
Thu Feb 6 13:25:30 CST 2014
Module: wine
Branch: master
Commit: 59226e36b79b60a26345481022109ccce9341cb4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=59226e36b79b60a26345481022109ccce9341cb4
Author: Ken Thomases <ken at codeweavers.com>
Date: Wed Feb 5 15:24:19 2014 -0600
wined3d: Don't clear the GL context if it's not the one being destroyed by context_destroy_gl_resources().
The previous code clears the GL context if the context being destroyed is
not valid, even though the current one is some arbitrary, unrelated context.
---
dlls/wined3d/context.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 587613c..c835414 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -888,10 +888,10 @@ static void context_destroy_gl_resources(struct wined3d_context *context)
restore_dc = wglGetCurrentDC();
restore_pf = GetPixelFormat(restore_dc);
- if (context->valid && restore_ctx != context->glCtx)
- context_set_gl_context(context);
- else
+ if (restore_ctx == context->glCtx)
restore_ctx = NULL;
+ else if (context->valid)
+ context_set_gl_context(context);
LIST_FOR_EACH_ENTRY(occlusion_query, &context->occlusion_queries, struct wined3d_occlusion_query, entry)
{
More information about the wine-cvs
mailing list