Henri Verbeet : wined3d: Disable the X11 / GL lock.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8a95eb060449e93bc38af1cabc928f0a959e9e14
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8a95eb060449e93bc38af1cabc...

Author: Henri Verbeet 
Date:   Wed Jul 18 21:32:33 2012 +0200

wined3d: Disable the X11 / GL lock.

---

dlls/wined3d/wined3d_private.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 08e9370..bc9523f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -785,11 +785,11 @@ extern void (CDECL *wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN;
 extern int num_lock DECLSPEC_HIDDEN;

#if 0
-#define ENTER_GL() ++num_lock; if (num_lock > 1) FIXME("Recursive use of GL lock to: %d\n", num_lock); wine_tsx11_lock_ptr()
-#define LEAVE_GL() if (num_lock != 1) FIXME("Recursive use of GL lock: %d\n", num_lock); --num_lock; wine_tsx11_unlock_ptr()
-#else
 #define ENTER_GL() wine_tsx11_lock_ptr()
 #define LEAVE_GL() wine_tsx11_unlock_ptr()
+#else
+#define ENTER_GL() do {} while(0)
+#define LEAVE_GL() do {} while(0)
 #endif

/*****************************************************************************