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

wined3d: glDeleteFramebuffersEXT() needs a context.

This commit is contained in:
Henri Verbeet 2008-08-24 23:43:02 +02:00 committed by Alexandre Julliard
parent ded5b05e4a
commit e3507a725f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/wined3d/context.c
View File

@ -644,15 +644,16 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con
*****************************************************************************/ *****************************************************************************/
void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) {
/* check that we are the current context first */
TRACE("Destroying ctx %p\n", context); TRACE("Destroying ctx %p\n", context);
if(pwglGetCurrentContext() == context->glCtx){
pwglMakeCurrent(NULL, NULL); /* The correct GL context needs to be active to cleanup the GL resources below */
} else { if(pwglGetCurrentContext() != context->glCtx){
pwglMakeCurrent(context->hdc, context->glCtx);
last_device = NULL; last_device = NULL;
} }
/* FIXME: We probably need an active context to do this... */ ENTER_GL();
if (context->fbo) { if (context->fbo) {
GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->fbo)); GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->fbo));
} }
@ -663,9 +664,13 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) {
GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->dst_fbo)); GL_EXTCALL(glDeleteFramebuffersEXT(1, &context->dst_fbo));
} }
LEAVE_GL();
HeapFree(GetProcessHeap(), 0, context->fbo_color_attachments); HeapFree(GetProcessHeap(), 0, context->fbo_color_attachments);
context->fbo_color_attachments = NULL; context->fbo_color_attachments = NULL;
/* Cleanup the GL context */
pwglMakeCurrent(NULL, NULL);
if(context->isPBuffer) { if(context->isPBuffer) {
GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc)); GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc));
GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer)); GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer));