Alexandre Julliard : wined3d: Remove references to the (no longer used) X11 lock.
Alexandre Julliard
julliard at winehq.org
Thu Aug 16 15:26:13 CDT 2012
Module: wine
Branch: master
Commit: 3bd185c3df38509b1ee71cebf4cf2373cdf792f8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd185c3df38509b1ee71cebf4cf2373cdf792f8
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Aug 16 16:52:16 2012 +0200
wined3d: Remove references to the (no longer used) X11 lock.
---
dlls/wined3d/wined3d_main.c | 20 --------------------
dlls/wined3d/wined3d_private.h | 13 -------------
2 files changed, 0 insertions(+), 33 deletions(-)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index fb8493c..2247e9c 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -48,10 +48,6 @@ struct wined3d_wndproc_table
static struct wined3d_wndproc_table wndproc_table;
-int num_lock = 0;
-void (CDECL *wine_tsx11_lock_ptr)(void) = NULL;
-void (CDECL *wine_tsx11_unlock_ptr)(void) = NULL;
-
static CRITICAL_SECTION wined3d_cs;
static CRITICAL_SECTION_DEBUG wined3d_cs_debug =
{
@@ -132,14 +128,9 @@ static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DW
return ERROR_FILE_NOT_FOUND;
}
-static void CDECL wined3d_do_nothing(void)
-{
-}
-
static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
{
DWORD wined3d_context_tls_idx;
- HMODULE mod;
char buffer[MAX_PATH+10];
DWORD size = sizeof(buffer);
HKEY hkey = 0;
@@ -183,17 +174,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
DisableThreadLibraryCalls(hInstDLL);
- mod = GetModuleHandleA( "winex11.drv" );
- if (mod)
- {
- wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" );
- wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" );
- }
- else /* We are most likely on Windows */
- {
- wine_tsx11_lock_ptr = wined3d_do_nothing;
- wine_tsx11_unlock_ptr = wined3d_do_nothing;
- }
/* @@ Wine registry key: HKCU\Software\Wine\Direct3D */
if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c0b00bf..c23a6fa 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -784,21 +784,8 @@ extern const struct wined3d_shader_backend_ops glsl_shader_backend DECLSPEC_HIDD
extern const struct wined3d_shader_backend_ops arb_program_shader_backend DECLSPEC_HIDDEN;
extern const struct wined3d_shader_backend_ops none_shader_backend DECLSPEC_HIDDEN;
-/* X11 locking */
-
-extern void (CDECL *wine_tsx11_lock_ptr)(void) DECLSPEC_HIDDEN;
-extern void (CDECL *wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN;
-
-/* As GLX relies on X, this is needed */
-extern int num_lock DECLSPEC_HIDDEN;
-
-#if 0
-#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
/*****************************************************************************
* Defines
More information about the wine-cvs
mailing list