Module: wine Branch: master Commit: 9b048221709c31c46f3dbc6ee4b6406c0961a452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b048221709c31c46f3dbc6ee4... Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Apr 3 00:12:04 2008 +0300 wined3d: Remove ENTER_GL/LEAVE_GL in IWineD3DTextureImpl_PreLoad. --- dlls/wined3d/texture.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 294dd1d..a6919ef 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -115,7 +115,7 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { } IWineD3DTexture_BindTexture(iface); - ENTER_GL(); + /* If the texture is marked dirty or the srgb sampler setting has changed since the last load then reload the surfaces */ if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { @@ -135,7 +135,6 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { } else { TRACE("(%p) Texture not dirty, nothing to do\n" , iface); } - LEAVE_GL(); /* No longer dirty */ This->baseTexture.dirty = FALSE;