http://git.etersoft.ru/projects
/
wine
/
eterwine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b54553a
)
wined3d: Remove ENTER_GL/LEAVE_GL in IWineD3DTextureImpl_PreLoad.
author
Alexander Dorofeyev
<alexd4@inbox.lv>
Wed, 2 Apr 2008 21:12:04 +0000
(
00:12
+0300)
committer
Alexandre Julliard
<julliard@winehq.org>
Thu, 3 Apr 2008 09:31:19 +0000
(11:31 +0200)
dlls/wined3d/texture.c
patch
|
blob
|
blame
|
history
diff --git
a/dlls/wined3d/texture.c
b/dlls/wined3d/texture.c
index 294dd1d6f636b7aea5089b4afd673f3b4f2ad81d..a6919ef2f1c275adcd57ec771f5fa68749168c6c 100644
(file)
--- 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;