Henri Verbeet : wined3d: Don't do GL calls without a context.
Alexandre Julliard
julliard at winehq.org
Thu Oct 9 07:42:36 CDT 2008
Module: wine
Branch: master
Commit: af6636c21c47e4185cb6913331a25a59793d0ff9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6636c21c47e4185cb6913331a25a59793d0ff9
Author: Henri Verbeet <hverbeet at gmail.com>
Date: Wed Oct 8 17:34:51 2008 +0200
wined3d: Don't do GL calls without a context.
---
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) {
More information about the wine-cvs
mailing list