From 6d0548bdc0f0234e1cf2f0776884432eff69ff61 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 8 Oct 2008 17:34:51 +0200 Subject: wined3d: Don't do GL calls without a context. This used to be part of a workaround for a driver bug, but it breaks correct drivers. --- dlls/wined3d/context.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ce432c9..bfa2ce2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,12 +1493,13 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU else { TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); - This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); ret = pwglMakeCurrent(context->hdc, context->glCtx); if(ret == FALSE) { ERR("Failed to activate the new context\n"); } else if(!context->last_was_blit) { This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); + } else { + This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); } } if(This->activeContext->vshader_const_dirty) { -- 1.5.6.4