From 7f2257ca556f607e9e91337e67a0c12d40e73199 Mon Sep 17 00:00:00 2001 From: Alexander Dorofeyev Date: Mon, 7 Apr 2008 00:06:25 +0300 Subject: [PATCH] wined3d: Add device->isInDraw checks in LoadLocation. Prevents calling ActivateContext while holding gl lock, e.g. when preloading texture in sampler(). --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8190a15c20..97f0438129 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4043,7 +4043,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D /* Download the surface to system memory */ if(This->Flags & SFLAG_INTEXTURE) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if(!device->isInDraw) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); surface_bind_and_dirtify(This); surface_download_data(This); @@ -4101,7 +4101,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } else { /* Upload from system memory */ d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if(!device->isInDraw) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); surface_bind_and_dirtify(This); ENTER_GL(); -- 2.33.8