reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 06:00:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Remove references to the (no longer used) X11 lock.

Browse Source
This commit is contained in:
Alexandre Julliard 2012-08-16 16:52:16 +02:00
parent cf1be58706
commit 3bd185c3df
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/wined3d/wined3d_main.c
View File

@ -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;

13
dlls/wined3d/wined3d_private.h
View File

@ -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