mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-22 11:20:11 +01:00
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 <jfonseca@vmware.com>
This commit is contained in:
parent
0b0114cc3b
commit
02cb04c68f
6 changed files with 3 additions and 30 deletions
|
|
@ -213,16 +213,6 @@ MakeContextCurrent(Display * dpy, GLXDrawable draw,
|
||||||
struct glx_context *gc = (struct glx_context *) gc_user;
|
struct glx_context *gc = (struct glx_context *) gc_user;
|
||||||
struct glx_context *oldGC = __glXGetCurrentContext();
|
struct glx_context *oldGC = __glXGetCurrentContext();
|
||||||
|
|
||||||
/* XXX: If this is left out, then libGL ends up not having this
|
|
||||||
* symbol, and drivers using it fail to load. Compare the
|
|
||||||
* implementation of this symbol to _glapi_noop_enable_warnings(),
|
|
||||||
* though, which gets into the library despite no callers, the same
|
|
||||||
* prototypes, and the same compile flags to the files containing
|
|
||||||
* them. Moving the definition to glapi_nop.c gets it into the
|
|
||||||
* library, though.
|
|
||||||
*/
|
|
||||||
(void)_glthread_GetID();
|
|
||||||
|
|
||||||
/* Make sure that the new context has a nonzero ID. In the request,
|
/* Make sure that the new context has a nonzero ID. In the request,
|
||||||
* a zero context ID is used only to mean that we bind to no current
|
* a zero context ID is used only to mean that we bind to no current
|
||||||
* context.
|
* context.
|
||||||
|
|
|
||||||
|
|
@ -168,10 +168,6 @@ _GLAPI_EXPORT struct _glapi_table *
|
||||||
_glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
|
_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.
|
* These stubs are kept so that the old DRI drivers still load.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -222,12 +222,6 @@ _glapi_get_proc_name(unsigned int offset)
|
||||||
return stub ? stub_get_name(stub) : NULL;
|
return stub ? stub_get_name(stub) : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long
|
|
||||||
_glthread_GetID(void)
|
|
||||||
{
|
|
||||||
return u_thread_self();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
_glapi_noop_enable_warnings(unsigned char enable)
|
_glapi_noop_enable_warnings(unsigned char enable)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -101,8 +101,8 @@ u_thread_self(void)
|
||||||
* So for now, we side-step this mess and use Windows thread primitives
|
* So for now, we side-step this mess and use Windows thread primitives
|
||||||
* directly here.
|
* directly here.
|
||||||
*
|
*
|
||||||
* FIXME: On the other hand, u_thread_self() and _glthread_GetID() are bad
|
* FIXME: On the other hand, u_thread_self() is a bad
|
||||||
* abstractions. Even with pthreads, there is no guarantee that
|
* abstraction. Even with pthreads, there is no guarantee that
|
||||||
* pthread_self() will return numeric IDs -- we should be using
|
* pthread_self() will return numeric IDs -- we should be using
|
||||||
* pthread_equal() instead of assuming we can compare thread ids...
|
* pthread_equal() instead of assuming we can compare thread ids...
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -76,12 +76,6 @@ _glapi_get_dispatch_table_size(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
PUBLIC unsigned long
|
|
||||||
_glthread_GetID(void)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef NO_MAIN
|
#ifndef NO_MAIN
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -783,8 +783,7 @@ radeon_render_texture(struct gl_context * ctx,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
DBG("Begin render texture tid %lx tex=%u w=%d h=%d refcount=%d\n",
|
DBG("Begin render texture tex=%u w=%d h=%d refcount=%d\n",
|
||||||
_glthread_GetID(),
|
|
||||||
att->Texture->Name, newImage->Width, newImage->Height,
|
att->Texture->Name, newImage->Width, newImage->Height,
|
||||||
rb->RefCount);
|
rb->RefCount);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue