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

wined3d: Prevent GL calls from DestroyContext() if we failed to make the GL context current. 

This can happen if the window is destroyed before the device is released.
This commit is contained in:
Henri Verbeet 2009-06-29 10:11:23 +02:00 committed by Alexandre Julliard
parent 6df3f23bca
commit 40565211fb
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/wined3d/context.c
View File

@ -1158,30 +1158,38 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con
*****************************************************************************/ *****************************************************************************/
void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) {
struct fbo_entry *entry, *entry2; struct fbo_entry *entry, *entry2;
BOOL has_glctx;
TRACE("Destroying ctx %p\n", context); TRACE("Destroying ctx %p\n", context);
/* The correct GL context needs to be active to cleanup the GL resources below */ /* The correct GL context needs to be active to cleanup the GL resources below */
if(pwglGetCurrentContext() != context->glCtx){ has_glctx = pwglMakeCurrent(context->hdc, context->glCtx);
pwglMakeCurrent(context->hdc, context->glCtx); last_device = NULL;
last_device = NULL;
} if (!has_glctx) WARN("Failed to activate context. Window already destroyed?\n");
ENTER_GL(); ENTER_GL();
LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) {
if (!has_glctx) entry->id = 0;
context_destroy_fbo_entry(This, context, entry); context_destroy_fbo_entry(This, context, entry);
} }
if (context->src_fbo) { if (has_glctx)
TRACE("Destroy src FBO %d\n", context->src_fbo); {
context_destroy_fbo(This, &context->src_fbo); if (context->src_fbo)
} {
if (context->dst_fbo) { TRACE("Destroy src FBO %d\n", context->src_fbo);
TRACE("Destroy dst FBO %d\n", context->dst_fbo); context_destroy_fbo(This, &context->src_fbo);
context_destroy_fbo(This, &context->dst_fbo); }
} if (context->dst_fbo)
if(context->dummy_arbfp_prog) { {
GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); TRACE("Destroy dst FBO %d\n", context->dst_fbo);
context_destroy_fbo(This, &context->dst_fbo);
}
if (context->dummy_arbfp_prog)
{
GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog));
}
} }
LEAVE_GL(); LEAVE_GL();