Mesa (master): glapi: restore _glthread_GetID() function

Brian Paul brianp at kemper.freedesktop.org
Fri Mar 14 18:12:24 UTC 2014


Module: Mesa
Branch: master
Commit: 6757ec3f8edd7ac509a1ec30d3d8c49462ade545
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6757ec3f8edd7ac509a1ec30d3d8c49462ade545

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Mar 14 10:13:16 2014 -0600

glapi: restore _glthread_GetID() function

This partially reverts patch 02cb04c68f.  This fixes an unresolved
symbol error when using older builds of libGL.

Tested-by: Chia-I Wu <olv at lunarg.com>

---

 src/mapi/glapi/glapi.h |    5 +++++
 src/mapi/mapi_glapi.c  |   10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/mapi/glapi/glapi.h b/src/mapi/glapi/glapi.h
index 7c22985..e2fa925 100644
--- a/src/mapi/glapi/glapi.h
+++ b/src/mapi/glapi/glapi.h
@@ -168,6 +168,11 @@ _GLAPI_EXPORT struct _glapi_table *
 _glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
 
 
+/** Deprecated function */
+_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 7b0903b..127dfaf 100644
--- a/src/mapi/mapi_glapi.c
+++ b/src/mapi/mapi_glapi.c
@@ -222,6 +222,16 @@ _glapi_get_proc_name(unsigned int offset)
    return stub ? stub_get_name(stub) : NULL;
 }
 
+/**
+ * This is a deprecated function which should not be used anymore.
+ * It's only present to satisfy linking with older versions of libGL.
+ */
+unsigned long
+_glthread_GetID(void)
+{
+   return 0;
+}
+
 void
 _glapi_noop_enable_warnings(unsigned char enable)
 {




More information about the mesa-commit mailing list