diff options
| author | Brian Paul <[email protected]> | 2014-03-04 15:24:16 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2014-03-05 11:05:48 -0700 |
| commit | 02cb04c68ffbdaffaf7513ddc951584cac29f209 (patch) | |
| tree | 9612e6e4f9f93f370cdd43196b168e286726b430 /src/mapi | |
| parent | 0b0114cc3bd8ceccaa6cbad161a13f2da2631ae0 (diff) | |
mesa: remove remaining uses of _glthread_GetID()
It was really only used in the radeon driver for a debug printf.
And evidently, libGL.so referenced it just to work around some sort
of linker issue.
This patch removes the two calls to the function and the function
itself.
Fixes undefined _glthread_GetID symbol in libGL reported by 'nm'.
Though, the missing symbol doesn't cause any issues on my system but
it does cause glxinfo to fail on one of our test systems.
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/glapi.h | 4 | ||||
| -rw-r--r-- | src/mapi/mapi_glapi.c | 6 | ||||
| -rw-r--r-- | src/mapi/u_thread.h | 4 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h index dcf91a7f3f4..7c22985ec40 100644 --- a/src/mapi/glapi/glapi.h +++ b/src/mapi/glapi/glapi.h @@ -168,10 +168,6 @@ _GLAPI_EXPORT struct _glapi_table * _glapi_create_table_from_handle(void *handle, const char *symbol_prefix); -_GLAPI_EXPORT unsigned long -_glthread_GetID(void); - - /* * These stubs are kept so that the old DRI drivers still load. */ diff --git a/src/mapi/mapi_glapi.c b/src/mapi/mapi_glapi.c index 7b9f1aee492..925caf36c08 100644 --- a/src/mapi/mapi_glapi.c +++ b/src/mapi/mapi_glapi.c @@ -222,12 +222,6 @@ _glapi_get_proc_name(unsigned int offset) return stub ? stub_get_name(stub) : NULL; } -unsigned long -_glthread_GetID(void) -{ - return u_thread_self(); -} - void _glapi_noop_enable_warnings(unsigned char enable) { diff --git a/src/mapi/u_thread.h b/src/mapi/u_thread.h index 3e183589c98..0fc93929c99 100644 --- a/src/mapi/u_thread.h +++ b/src/mapi/u_thread.h @@ -101,8 +101,8 @@ u_thread_self(void) * So for now, we side-step this mess and use Windows thread primitives * directly here. * - * FIXME: On the other hand, u_thread_self() and _glthread_GetID() are bad - * abstractions. Even with pthreads, there is no guarantee that + * FIXME: On the other hand, u_thread_self() is a bad + * abstraction. Even with pthreads, there is no guarantee that * pthread_self() will return numeric IDs -- we should be using * pthread_equal() instead of assuming we can compare thread ids... */ |