Fixes link/runtime errors for missing glXGetProcAddressARB.
---
src/mesa/drivers/x11/glxapi.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index a17c2c3..8a43c78 100644
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1082,7 +1082,7 @@ glXGetAGPOffsetMESA( const GLvoid *pointer )
/*** GLX_MESA_allocate_memory */
-void *
+void PUBLIC *
glXAllocateMemoryMESA(Display *dpy, int scrn, size_t size,
float readfreq, float writefreq, float priority)
{
@@ -1090,14 +1090,14 @@ glXAllocateMemoryMESA(Display *dpy, int scrn, size_t
size,
return NULL;
}
-void
+void PUBLIC
glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer)
{
/* dummy */
}
-GLuint
+GLuint PUBLIC
glXGetMemoryOffsetMESA(Display *dpy, int scrn, const void *pointer)
{
/* dummy */
@@ -1107,7 +1107,7 @@ glXGetMemoryOffsetMESA(Display *dpy, int scrn, const void
*pointer)
/*** GLX_EXT_texture_from_pixmap */
-void
+PUBLIC void
glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer,
const int *attrib_list)
{
@@ -1117,7 +1117,7 @@ glXBindTexImageEXT(Display *dpy, GLXDrawable drawable,
int buffer,
t->BindTexImageEXT(dpy, drawable, buffer, attrib_list);
}
-void
+PUBLIC void
glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer)
{
struct _glxapi_table *t;
@@ -1132,7 +1132,7 @@ glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable,
int buffer)
/**********************************************************************/
-const char *
+PUBLIC const char *
_glxapi_get_version(void)
{
return "1.3";
@@ -1142,7 +1142,7 @@ _glxapi_get_version(void)
/*
* Return array of extension strings.
*/
-const char **
+PUBLIC const char **
_glxapi_get_extensions(void)
{
static const char *extensions[] = {
@@ -1185,7 +1185,7 @@ _glxapi_get_extensions(void)
/*
* Return size of the GLX dispatch table, in entries, not bytes.
*/
-GLuint
+PUBLIC GLuint
_glxapi_get_dispatch_table_size(void)
{
return sizeof(struct _glxapi_table) / sizeof(void *);
@@ -1202,7 +1202,7 @@ generic_no_op_func(void)
/*
* Initialize all functions in given dispatch table to be no-ops
*/
-void
+PUBLIC void
_glxapi_set_no_op_table(struct _glxapi_table *t)
{
typedef int (*nop_func)(void);
@@ -1373,7 +1373,7 @@ static struct name_address_pair GLX_functions[] = {
/*
* Return address of named glX function, or NULL if not found.
*/
-__GLXextFuncPtr
+PUBLIC __GLXextFuncPtr
_glxapi_get_proc_address(const char *funcName)
{
GLuint i;
@@ -1395,7 +1395,7 @@ _glxapi_get_proc_address(const char *funcName)
* This function does not get dispatched through the dispatch table
* since it's really a "meta" function.
*/
-__GLXextFuncPtr
+PUBLIC __GLXextFuncPtr
glXGetProcAddressARB(const GLubyte *procName)
{
__GLXextFuncPtr f;
@@ -1411,7 +1411,7 @@ glXGetProcAddressARB(const GLubyte *procName)
/* GLX 1.4 */
-void (*glXGetProcAddress(const GLubyte *procName))()
+PUBLIC void (*glXGetProcAddress(const GLubyte *procName))()
{
return glXGetProcAddressARB(procName);
}
--
1.6.3.3
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
