From 817b520c3d5ed88abb959dbbbd85aa53eecb661d Mon Sep 17 00:00:00 2001 From: Roderick Colenbrander Date: Fri, 9 Nov 2007 16:38:50 +0100 Subject: [PATCH] wined3d: Prevent unneeded context switches. --- dlls/wined3d/context.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8311ab5be9d..32d75b60835 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -860,10 +860,17 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* Activate the opengl context */ if(context != This->activeContext) { BOOL ret; - TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); - ret = pwglMakeCurrent(context->hdc, context->glCtx); - if(ret == FALSE) { - ERR("Failed to activate the new context\n"); + + /* Prevent an unneeded context switch as those are expensive */ + if(context->glCtx && (context->glCtx == pwglGetCurrentContext())) { + TRACE("Already using gl context %p\n", context->glCtx); + } + else { + TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); + ret = pwglMakeCurrent(context->hdc, context->glCtx); + if(ret == FALSE) { + ERR("Failed to activate the new context\n"); + } } This->activeContext = context; } -- 2.11.4.GIT