Roderick Colenbrander : wined3d: Remove ENTER_GL/ LEAVE_GL from VolumeTexture_PreLoad because it doesn't make any GL calls.
Alexandre Julliard
julliard at winehq.org
Mon Oct 20 08:00:33 CDT 2008
Module: wine
Branch: master
Commit: 728e61e78bf4171f8754fe175f53ad208662632d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=728e61e78bf4171f8754fe175f53ad208662632d
Author: Roderick Colenbrander <thunderbird2k at gmx.net>
Date: Sun Oct 19 00:13:20 2008 +0000
wined3d: Remove ENTER_GL/LEAVE_GL from VolumeTexture_PreLoad because it doesn't make any GL calls.
---
dlls/wined3d/volumetexture.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index 035cf90..53275e1 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -107,7 +107,7 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac
srgb_was_toggled = This->baseTexture.is_srgb != srgb_mode;
This->baseTexture.is_srgb = srgb_mode;
}
- 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++)
@@ -125,7 +125,6 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac
} else {
TRACE("(%p) Texture not dirty, nothing to do\n" , iface);
}
- LEAVE_GL();
/* No longer dirty */
This->baseTexture.dirty = FALSE;
More information about the wine-cvs
mailing list