wined3d: Disable the X11 / GL lock.

8a95eb06 · Henri Verbeet · Alexandre Julliard · f1aea860 · 8a95eb06
Commit 8a95eb06 authored Jul 18, 2012 by Henri Verbeet Committed by Alexandre Julliard Jul 19, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

wined3d_private.h dlls/wined3d/wined3d_private.h +3 -3

No files found.
--- 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

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