X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fx11%2Fglxapi.c;h=255a37bf295d928efcbeaa0bb851b89efbd7a30e;hb=774fb90db3e83d5e7326b7a72e05ce805c306b24;hp=781da5cb13b83619453df309d4bfb0ffae50269a;hpb=655ba5d9927187e76b66f5886d090624dc4b1dd9;p=mesa.git diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 781da5cb13b..255a37bf295 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -1,10 +1,8 @@ -/* $Id: glxapi.c,v 1.26 2001/05/29 19:48:46 brianp Exp $ */ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 7.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -28,6 +26,7 @@ /* * This is the GLX API dispatcher. Calls to the glX* functions are * either routed to the real GLX encoders or to Mesa's pseudo-GLX functions. + * See the glxapi.h file for more details. */ @@ -35,8 +34,9 @@ #include #include #include -/*#include */ /* XXX not portable? */ -#include "glapi.h" +#include "main/glheader.h" +#include "main/compiler.h" +#include "glapi/glapi.h" #include "glxapi.h" @@ -50,6 +50,36 @@ struct display_dispatch { struct display_dispatch *Next; }; + +/** + * When GLX_INDIRECT_RENDERING is defined, some symbols are missing in + * libglapi.a. We need to define them here. + */ +#ifdef GLX_INDIRECT_RENDERING + +#include "glapi/glapitable.h" + +#define KEYWORD1 PUBLIC + +#if defined(USE_MGL_NAMESPACE) +#define NAME(func) mgl##func +#else +#define NAME(func) gl##func +#endif + +#define DISPATCH(FUNC, ARGS, MESSAGE) \ + GET_DISPATCH()->FUNC ARGS + +#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) \ + return GET_DISPATCH()->FUNC ARGS + +/* skip normal ones */ +#define _GLAPI_SKIP_NORMAL_ENTRY_POINTS +#include "glapi/glapitemp.h" + +#endif /* GLX_INDIRECT_RENDERING */ + + static struct display_dispatch *DispatchList = NULL; @@ -81,29 +111,7 @@ get_dispatch(Display *dpy) * or Mesa's pseudo-GLX. */ { - struct _glxapi_table *t = NULL; - -#ifdef GLX_BUILD_IN_XLIB_MESA - if (!getenv("LIBGL_FORCE_XMESA")) { - int ignore; - if (XQueryExtension( dpy, "GLX", &ignore, &ignore, &ignore )) { - /* the X server has the GLX extension */ - t = _real_GetGLXDispatchTable(); - } - } -#endif - - if (!t) { - /* Fallback to Mesa with Xlib driver */ -#ifdef GLX_BUILD_IN_XLIB_MESA - if (getenv("LIBGL_DEBUG")) { - fprintf(stderr, - "libGL: server lacks GLX extension. Using Mesa Xlib renderer.\n"); - } -#endif - t = _mesa_GetGLXDispatchTable(); - assert(t); /* this has to work */ - } + struct _glxapi_table *t = _mesa_GetGLXDispatchTable(); if (t) { struct display_dispatch *d; @@ -130,6 +138,9 @@ get_dispatch(Display *dpy) } +/* Don't use the GET_DISPATCH defined in glthread.h */ +#undef GET_DISPATCH + #define GET_DISPATCH(DPY, TABLE) \ if (DPY == prevDisplay) { \ TABLE = prevTable; \ @@ -144,20 +155,40 @@ get_dispatch(Display *dpy) -/* Set by glXMakeCurrent() and glXMakeContextCurrent() only */ -#ifndef GLX_BUILD_IN_XLIB_MESA +/** + * GLX API current context. + */ +#if defined(GLX_USE_TLS) +PUBLIC __thread void * CurrentContext + __attribute__((tls_model("initial-exec"))); +#elif defined(THREADS) +static _glthread_TSD ContextTSD; /**< Per-thread context pointer */ +#else static GLXContext CurrentContext = 0; -#define __glXGetCurrentContext() CurrentContext; #endif +static void +SetCurrentContext(GLXContext c) +{ +#if defined(GLX_USE_TLS) + CurrentContext = c; +#elif defined(THREADS) + _glthread_SetTSD(&ContextTSD, c); +#else + CurrentContext = c; +#endif +} + + /* * GLX API entrypoints */ /*** GLX_VERSION_1_0 ***/ -XVisualInfo *glXChooseVisual(Display *dpy, int screen, int *list) +XVisualInfo PUBLIC * +glXChooseVisual(Display *dpy, int screen, int *list) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -167,7 +198,8 @@ XVisualInfo *glXChooseVisual(Display *dpy, int screen, int *list) } -void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, unsigned long mask) +void PUBLIC +glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, unsigned long mask) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -177,7 +209,8 @@ void glXCopyContext(Display *dpy, GLXContext src, GLXContext dst, unsigned long } -GLXContext glXCreateContext(Display *dpy, XVisualInfo *visinfo, GLXContext shareList, Bool direct) +GLXContext PUBLIC +glXCreateContext(Display *dpy, XVisualInfo *visinfo, GLXContext shareList, Bool direct) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -187,7 +220,8 @@ GLXContext glXCreateContext(Display *dpy, XVisualInfo *visinfo, GLXContext share } -GLXPixmap glXCreateGLXPixmap(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap) +GLXPixmap PUBLIC +glXCreateGLXPixmap(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -197,17 +231,21 @@ GLXPixmap glXCreateGLXPixmap(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap) } -void glXDestroyContext(Display *dpy, GLXContext ctx) +void PUBLIC +glXDestroyContext(Display *dpy, GLXContext ctx) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); if (!t) return; + if (glXGetCurrentContext() == ctx) + SetCurrentContext(NULL); (t->DestroyContext)(dpy, ctx); } -void glXDestroyGLXPixmap(Display *dpy, GLXPixmap pixmap) +void PUBLIC +glXDestroyGLXPixmap(Display *dpy, GLXPixmap pixmap) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -217,7 +255,8 @@ void glXDestroyGLXPixmap(Display *dpy, GLXPixmap pixmap) } -int glXGetConfig(Display *dpy, XVisualInfo *visinfo, int attrib, int *value) +int PUBLIC +glXGetConfig(Display *dpy, XVisualInfo *visinfo, int attrib, int *value) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -227,30 +266,29 @@ int glXGetConfig(Display *dpy, XVisualInfo *visinfo, int attrib, int *value) } -#ifdef GLX_BUILD_IN_XLIB_MESA -/* Use real libGL's glXGetCurrentContext() function */ -#else -/* stand-alone Mesa */ -GLXContext glXGetCurrentContext(void) +GLXContext PUBLIC +glXGetCurrentContext(void) { +#if defined(GLX_USE_TLS) + return CurrentContext; +#elif defined(THREADS) + return (GLXContext) _glthread_GetTSD(&ContextTSD); +#else return CurrentContext; -} #endif +} -#ifdef GLX_BUILD_IN_XLIB_MESA -/* Use real libGL's glXGetCurrentContext() function */ -#else -/* stand-alone Mesa */ -GLXDrawable glXGetCurrentDrawable(void) +GLXDrawable PUBLIC +glXGetCurrentDrawable(void) { __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext(); return gc ? gc->currentDrawable : 0; } -#endif -Bool glXIsDirect(Display *dpy, GLXContext ctx) +Bool PUBLIC +glXIsDirect(Display *dpy, GLXContext ctx) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -260,24 +298,25 @@ Bool glXIsDirect(Display *dpy, GLXContext ctx) } -Bool glXMakeCurrent(Display *dpy, GLXDrawable drawable, GLXContext ctx) +Bool PUBLIC +glXMakeCurrent(Display *dpy, GLXDrawable drawable, GLXContext ctx) { Bool b; struct _glxapi_table *t; GET_DISPATCH(dpy, t); - if (!t) + if (!t) { return False; + } b = (*t->MakeCurrent)(dpy, drawable, ctx); -#ifndef GLX_BUILD_IN_XLIB_MESA if (b) { - CurrentContext = ctx; + SetCurrentContext(ctx); } -#endif return b; } -Bool glXQueryExtension(Display *dpy, int *errorb, int *event) +Bool PUBLIC +glXQueryExtension(Display *dpy, int *errorb, int *event) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -287,7 +326,8 @@ Bool glXQueryExtension(Display *dpy, int *errorb, int *event) } -Bool glXQueryVersion(Display *dpy, int *maj, int *min) +Bool PUBLIC +glXQueryVersion(Display *dpy, int *maj, int *min) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -297,7 +337,8 @@ Bool glXQueryVersion(Display *dpy, int *maj, int *min) } -void glXSwapBuffers(Display *dpy, GLXDrawable drawable) +void PUBLIC +glXSwapBuffers(Display *dpy, GLXDrawable drawable) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -307,7 +348,8 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable) } -void glXUseXFont(Font font, int first, int count, int listBase) +void PUBLIC +glXUseXFont(Font font, int first, int count, int listBase) { struct _glxapi_table *t; Display *dpy = glXGetCurrentDisplay(); @@ -318,7 +360,8 @@ void glXUseXFont(Font font, int first, int count, int listBase) } -void glXWaitGL(void) +void PUBLIC +glXWaitGL(void) { struct _glxapi_table *t; Display *dpy = glXGetCurrentDisplay(); @@ -329,7 +372,8 @@ void glXWaitGL(void) } -void glXWaitX(void) +void PUBLIC +glXWaitX(void) { struct _glxapi_table *t; Display *dpy = glXGetCurrentDisplay(); @@ -343,7 +387,8 @@ void glXWaitX(void) /*** GLX_VERSION_1_1 ***/ -const char *glXGetClientString(Display *dpy, int name) +const char PUBLIC * +glXGetClientString(Display *dpy, int name) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -353,7 +398,8 @@ const char *glXGetClientString(Display *dpy, int name) } -const char *glXQueryExtensionsString(Display *dpy, int screen) +const char PUBLIC * +glXQueryExtensionsString(Display *dpy, int screen) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -363,7 +409,8 @@ const char *glXQueryExtensionsString(Display *dpy, int screen) } -const char *glXQueryServerString(Display *dpy, int screen, int name) +const char PUBLIC * +glXQueryServerString(Display *dpy, int screen, int name) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -375,21 +422,21 @@ const char *glXQueryServerString(Display *dpy, int screen, int name) /*** GLX_VERSION_1_2 ***/ -#if !defined(GLX_BUILD_IN_XLIB_MESA) -Display *glXGetCurrentDisplay(void) +Display PUBLIC * +glXGetCurrentDisplay(void) { /* Same code as in libGL's glxext.c */ __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext(); if (NULL == gc) return NULL; return gc->currentDpy; } -#endif /*** GLX_VERSION_1_3 ***/ -GLXFBConfig *glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems) +GLXFBConfig PUBLIC * +glXChooseFBConfig(Display *dpy, int screen, const int *attribList, int *nitems) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -399,7 +446,8 @@ GLXFBConfig *glXChooseFBConfig(Display *dpy, int screen, const int *attribList, } -GLXContext glXCreateNewContext(Display *dpy, GLXFBConfig config, int renderType, GLXContext shareList, Bool direct) +GLXContext PUBLIC +glXCreateNewContext(Display *dpy, GLXFBConfig config, int renderType, GLXContext shareList, Bool direct) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -409,7 +457,8 @@ GLXContext glXCreateNewContext(Display *dpy, GLXFBConfig config, int renderType, } -GLXPbuffer glXCreatePbuffer(Display *dpy, GLXFBConfig config, const int *attribList) +GLXPbuffer PUBLIC +glXCreatePbuffer(Display *dpy, GLXFBConfig config, const int *attribList) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -419,7 +468,8 @@ GLXPbuffer glXCreatePbuffer(Display *dpy, GLXFBConfig config, const int *attribL } -GLXPixmap glXCreatePixmap(Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attribList) +GLXPixmap PUBLIC +glXCreatePixmap(Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attribList) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -429,7 +479,8 @@ GLXPixmap glXCreatePixmap(Display *dpy, GLXFBConfig config, Pixmap pixmap, const } -GLXWindow glXCreateWindow(Display *dpy, GLXFBConfig config, Window win, const int *attribList) +GLXWindow PUBLIC +glXCreateWindow(Display *dpy, GLXFBConfig config, Window win, const int *attribList) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -439,7 +490,8 @@ GLXWindow glXCreateWindow(Display *dpy, GLXFBConfig config, Window win, const in } -void glXDestroyPbuffer(Display *dpy, GLXPbuffer pbuf) +void PUBLIC +glXDestroyPbuffer(Display *dpy, GLXPbuffer pbuf) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -449,7 +501,8 @@ void glXDestroyPbuffer(Display *dpy, GLXPbuffer pbuf) } -void glXDestroyPixmap(Display *dpy, GLXPixmap pixmap) +void PUBLIC +glXDestroyPixmap(Display *dpy, GLXPixmap pixmap) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -459,7 +512,8 @@ void glXDestroyPixmap(Display *dpy, GLXPixmap pixmap) } -void glXDestroyWindow(Display *dpy, GLXWindow window) +void PUBLIC +glXDestroyWindow(Display *dpy, GLXWindow window) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -469,18 +523,16 @@ void glXDestroyWindow(Display *dpy, GLXWindow window) } -#ifdef GLX_BUILD_IN_XLIB_MESA -/* Use the glXGetCurrentReadDrawable() function from libGL */ -#else -GLXDrawable glXGetCurrentReadDrawable(void) +GLXDrawable PUBLIC +glXGetCurrentReadDrawable(void) { __GLXcontext *gc = (__GLXcontext *) glXGetCurrentContext(); return gc ? gc->currentReadable : 0; } -#endif -int glXGetFBConfigAttrib(Display *dpy, GLXFBConfig config, int attribute, int *value) +int PUBLIC +glXGetFBConfigAttrib(Display *dpy, GLXFBConfig config, int attribute, int *value) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -490,7 +542,8 @@ int glXGetFBConfigAttrib(Display *dpy, GLXFBConfig config, int attribute, int *v } -GLXFBConfig *glXGetFBConfigs(Display *dpy, int screen, int *nelements) +GLXFBConfig PUBLIC * +glXGetFBConfigs(Display *dpy, int screen, int *nelements) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -499,7 +552,8 @@ GLXFBConfig *glXGetFBConfigs(Display *dpy, int screen, int *nelements) return (t->GetFBConfigs)(dpy, screen, nelements); } -void glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask) +void PUBLIC +glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -509,7 +563,8 @@ void glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask } -XVisualInfo *glXGetVisualFromFBConfig(Display *dpy, GLXFBConfig config) +XVisualInfo PUBLIC * +glXGetVisualFromFBConfig(Display *dpy, GLXFBConfig config) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -519,7 +574,8 @@ XVisualInfo *glXGetVisualFromFBConfig(Display *dpy, GLXFBConfig config) } -Bool glXMakeContextCurrent(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx) +Bool PUBLIC +glXMakeContextCurrent(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx) { Bool b; struct _glxapi_table *t; @@ -527,16 +583,15 @@ Bool glXMakeContextCurrent(Display *dpy, GLXDrawable draw, GLXDrawable read, GLX if (!t) return False; b = (t->MakeContextCurrent)(dpy, draw, read, ctx); -#ifndef GLX_BUILD_IN_XLIB_MESA if (b) { - CurrentContext = ctx; + SetCurrentContext(ctx); } -#endif return b; } -int glXQueryContext(Display *dpy, GLXContext ctx, int attribute, int *value) +int PUBLIC +glXQueryContext(Display *dpy, GLXContext ctx, int attribute, int *value) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -547,7 +602,8 @@ int glXQueryContext(Display *dpy, GLXContext ctx, int attribute, int *value) } -void glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute, unsigned int *value) +void PUBLIC +glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute, unsigned int *value) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -557,7 +613,8 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute, unsigned in } -void glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask) +void PUBLIC +glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -570,7 +627,8 @@ void glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask) /*** GLX_SGI_swap_control ***/ -int glXSwapIntervalSGI(int interval) +int PUBLIC +glXSwapIntervalSGI(int interval) { struct _glxapi_table *t; Display *dpy = glXGetCurrentDisplay(); @@ -584,23 +642,25 @@ int glXSwapIntervalSGI(int interval) /*** GLX_SGI_video_sync ***/ -int glXGetVideoSyncSGI(unsigned int *count) +int PUBLIC +glXGetVideoSyncSGI(unsigned int *count) { struct _glxapi_table *t; Display *dpy = glXGetCurrentDisplay(); GET_DISPATCH(dpy, t); - if (!t) - return 0; + if (!t || !glXGetCurrentContext()) + return GLX_BAD_CONTEXT; return (t->GetVideoSyncSGI)(count); } -int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count) +int PUBLIC +glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count) { struct _glxapi_table *t; Display *dpy = glXGetCurrentDisplay(); GET_DISPATCH(dpy, t); - if (!t) - return 0; + if (!t || !glXGetCurrentContext()) + return GLX_BAD_CONTEXT; return (t->WaitVideoSyncSGI)(divisor, remainder, count); } @@ -608,29 +668,27 @@ int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count) /*** GLX_SGI_make_current_read ***/ -Bool glXMakeCurrentReadSGI(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx) +Bool PUBLIC +glXMakeCurrentReadSGI(Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); if (!t) - return 0; + return False; return (t->MakeCurrentReadSGI)(dpy, draw, read, ctx); } -#ifdef GLX_BUILD_IN_XLIB_MESA -/* Use glXGetCurrentReadDrawableSGI() from libGL */ -#else -/* stand-alone Mesa */ -GLXDrawable glXGetCurrentReadDrawableSGI(void) +GLXDrawable PUBLIC +glXGetCurrentReadDrawableSGI(void) { return glXGetCurrentReadDrawable(); } -#endif #if defined(_VL_H) -GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX(Display *dpy, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode) +GLXVideoSourceSGIX PUBLIC +glXCreateGLXVideoSourceSGIX(Display *dpy, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -639,7 +697,8 @@ GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX(Display *dpy, int screen, VLServe return (t->CreateGLXVideoSourceSGIX)(dpy, screen, server, path, nodeClass, drainNode); } -void glXDestroyGLXVideoSourceSGIX(Display *dpy, GLXVideoSourceSGIX src) +void PUBLIC +glXDestroyGLXVideoSourceSGIX(Display *dpy, GLXVideoSourceSGIX src) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -653,7 +712,8 @@ void glXDestroyGLXVideoSourceSGIX(Display *dpy, GLXVideoSourceSGIX src) /*** GLX_EXT_import_context ***/ -void glXFreeContextEXT(Display *dpy, GLXContext context) +void PUBLIC +glXFreeContextEXT(Display *dpy, GLXContext context) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -662,27 +722,20 @@ void glXFreeContextEXT(Display *dpy, GLXContext context) (t->FreeContextEXT)(dpy, context); } -#ifdef GLX_BUILD_IN_XLIB_MESA -/* Use real libGL's glXGetContextIDEXT() function */ -#else -/* stand-alone Mesa */ -GLXContextID glXGetContextIDEXT(const GLXContext context) +GLXContextID PUBLIC +glXGetContextIDEXT(const GLXContext context) { return ((__GLXcontext *) context)->xid; } -#endif -#ifdef GLX_BUILD_IN_XLIB_MESA -/* Use real libGL's glXGetCurrentDisplayEXT() function */ -#else -/* stand-alone Mesa */ -Display *glXGetCurrentDisplayEXT(void) +Display PUBLIC * +glXGetCurrentDisplayEXT(void) { return glXGetCurrentDisplay(); } -#endif -GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID) +GLXContext PUBLIC +glXImportContextEXT(Display *dpy, GLXContextID contextID) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -691,7 +744,8 @@ GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID) return (t->ImportContextEXT)(dpy, contextID); } -int glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute,int *value) +int PUBLIC +glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute,int *value) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -704,7 +758,8 @@ int glXQueryContextInfoEXT(Display *dpy, GLXContext context, int attribute,int * /*** GLX_SGIX_fbconfig ***/ -int glXGetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value) +int PUBLIC +glXGetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -713,7 +768,8 @@ int glXGetFBConfigAttribSGIX(Display *dpy, GLXFBConfigSGIX config, int attribute return (t->GetFBConfigAttribSGIX)(dpy, config, attribute, value); } -GLXFBConfigSGIX *glXChooseFBConfigSGIX(Display *dpy, int screen, int *attrib_list, int *nelements) +GLXFBConfigSGIX PUBLIC * +glXChooseFBConfigSGIX(Display *dpy, int screen, int *attrib_list, int *nelements) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -722,7 +778,8 @@ GLXFBConfigSGIX *glXChooseFBConfigSGIX(Display *dpy, int screen, int *attrib_lis return (t->ChooseFBConfigSGIX)(dpy, screen, attrib_list, nelements); } -GLXPixmap glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap) +GLXPixmap PUBLIC +glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -731,7 +788,8 @@ GLXPixmap glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, return (t->CreateGLXPixmapWithConfigSGIX)(dpy, config, pixmap); } -GLXContext glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct) +GLXContext PUBLIC +glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -740,7 +798,8 @@ GLXContext glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, return (t->CreateContextWithConfigSGIX)(dpy, config, render_type, share_list, direct); } -XVisualInfo * glXGetVisualFromFBConfigSGIX(Display *dpy, GLXFBConfigSGIX config) +XVisualInfo PUBLIC * +glXGetVisualFromFBConfigSGIX(Display *dpy, GLXFBConfigSGIX config) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -749,7 +808,8 @@ XVisualInfo * glXGetVisualFromFBConfigSGIX(Display *dpy, GLXFBConfigSGIX config) return (t->GetVisualFromFBConfigSGIX)(dpy, config); } -GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX(Display *dpy, XVisualInfo *vis) +GLXFBConfigSGIX PUBLIC +glXGetFBConfigFromVisualSGIX(Display *dpy, XVisualInfo *vis) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -762,7 +822,8 @@ GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX(Display *dpy, XVisualInfo *vis) /*** GLX_SGIX_pbuffer ***/ -GLXPbufferSGIX glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list) +GLXPbufferSGIX PUBLIC +glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -771,7 +832,8 @@ GLXPbufferSGIX glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config, uns return (t->CreateGLXPbufferSGIX)(dpy, config, width, height, attrib_list); } -void glXDestroyGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf) +void PUBLIC +glXDestroyGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -780,7 +842,8 @@ void glXDestroyGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf) (t->DestroyGLXPbufferSGIX)(dpy, pbuf); } -int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value) +int PUBLIC +glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -789,7 +852,8 @@ int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, uns return (t->QueryGLXPbufferSGIX)(dpy, pbuf, attribute, value); } -void glXSelectEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long mask) +void PUBLIC +glXSelectEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long mask) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -798,7 +862,8 @@ void glXSelectEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long mask) (t->SelectEventSGIX)(dpy, drawable, mask); } -void glXGetSelectedEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long *mask) +void PUBLIC +glXGetSelectedEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long *mask) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -811,7 +876,8 @@ void glXGetSelectedEventSGIX(Display *dpy, GLXDrawable drawable, unsigned long * /*** GLX_SGI_cushion ***/ -void glXCushionSGI(Display *dpy, Window win, float cushion) +void PUBLIC +glXCushionSGI(Display *dpy, Window win, float cushion) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -824,7 +890,8 @@ void glXCushionSGI(Display *dpy, Window win, float cushion) /*** GLX_SGIX_video_resize ***/ -int glXBindChannelToWindowSGIX(Display *dpy, int screen, int channel , Window window) +int PUBLIC +glXBindChannelToWindowSGIX(Display *dpy, int screen, int channel , Window window) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -833,7 +900,8 @@ int glXBindChannelToWindowSGIX(Display *dpy, int screen, int channel , Window wi return (t->BindChannelToWindowSGIX)(dpy, screen, channel, window); } -int glXChannelRectSGIX(Display *dpy, int screen, int channel, int x, int y, int w, int h) +int PUBLIC +glXChannelRectSGIX(Display *dpy, int screen, int channel, int x, int y, int w, int h) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -842,7 +910,8 @@ int glXChannelRectSGIX(Display *dpy, int screen, int channel, int x, int y, int return (t->ChannelRectSGIX)(dpy, screen, channel, x, y, w, h); } -int glXQueryChannelRectSGIX(Display *dpy, int screen, int channel, int *x, int *y, int *w, int *h) +int PUBLIC +glXQueryChannelRectSGIX(Display *dpy, int screen, int channel, int *x, int *y, int *w, int *h) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -851,7 +920,8 @@ int glXQueryChannelRectSGIX(Display *dpy, int screen, int channel, int *x, int * return (t->QueryChannelRectSGIX)(dpy, screen, channel, x, y, w, h); } -int glXQueryChannelDeltasSGIX(Display *dpy, int screen, int channel, int *dx, int *dy, int *dw, int *dh) +int PUBLIC +glXQueryChannelDeltasSGIX(Display *dpy, int screen, int channel, int *dx, int *dy, int *dw, int *dh) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -860,7 +930,8 @@ int glXQueryChannelDeltasSGIX(Display *dpy, int screen, int channel, int *dx, in return (t->QueryChannelDeltasSGIX)(dpy, screen, channel, dx, dy, dw, dh); } -int glXChannelRectSyncSGIX(Display *dpy, int screen, int channel, GLenum synctype) +int PUBLIC +glXChannelRectSyncSGIX(Display *dpy, int screen, int channel, GLenum synctype) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -873,7 +944,8 @@ int glXChannelRectSyncSGIX(Display *dpy, int screen, int channel, GLenum synctyp #if defined(_DM_BUFFER_H_) -Bool glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer) +Bool PUBLIC +glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -887,7 +959,8 @@ Bool glXAssociateDMPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuffer, DMparams *p /*** GLX_SGIX_swap_group ***/ -void glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member) +void PUBLIC +glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -899,7 +972,8 @@ void glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, GLXDrawable member /*** GLX_SGIX_swap_barrier ***/ -void glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier) +void PUBLIC +glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -908,7 +982,8 @@ void glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, int barrier) (*t->BindSwapBarrierSGIX)(dpy, drawable, barrier); } -Bool glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max) +Bool PUBLIC +glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -921,7 +996,8 @@ Bool glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max) /*** GLX_SUN_get_transparent_index ***/ -Status glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, long *pTransparent) +Status PUBLIC +glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, long *pTransparent) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -934,7 +1010,8 @@ Status glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, /*** GLX_MESA_copy_sub_buffer ***/ -void glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height) +void PUBLIC +glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -947,7 +1024,8 @@ void glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, int x, int y, int /*** GLX_MESA_release_buffers ***/ -Bool glXReleaseBuffersMESA(Display *dpy, Window w) +Bool PUBLIC +glXReleaseBuffersMESA(Display *dpy, Window w) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -960,7 +1038,8 @@ Bool glXReleaseBuffersMESA(Display *dpy, Window w) /*** GLX_MESA_pixmap_colormap ***/ -GLXPixmap glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colormap cmap) +GLXPixmap PUBLIC +glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixmap, Colormap cmap) { struct _glxapi_table *t; GET_DISPATCH(dpy, t); @@ -973,7 +1052,8 @@ GLXPixmap glXCreateGLXPixmapMESA(Display *dpy, XVisualInfo *visinfo, Pixmap pixm /*** GLX_MESA_set_3dfx_mode ***/ -Bool glXSet3DfxModeMESA(int mode) +Bool PUBLIC +glXSet3DfxModeMESA(int mode) { struct _glxapi_table *t; Display *dpy = glXGetCurrentDisplay(); @@ -985,6 +1065,72 @@ Bool glXSet3DfxModeMESA(int mode) +/*** GLX_NV_vertex_array_range ***/ + +void PUBLIC * +glXAllocateMemoryNV( GLsizei size, + GLfloat readFrequency, + GLfloat writeFrequency, + GLfloat priority ) +{ + struct _glxapi_table *t; + Display *dpy = glXGetCurrentDisplay(); + GET_DISPATCH(dpy, t); + if (!t) + return NULL; + return (t->AllocateMemoryNV)(size, readFrequency, writeFrequency, priority); +} + + +void PUBLIC +glXFreeMemoryNV( GLvoid *pointer ) +{ + struct _glxapi_table *t; + Display *dpy = glXGetCurrentDisplay(); + GET_DISPATCH(dpy, t); + if (!t) + return; + (t->FreeMemoryNV)(pointer); +} + + + + +/*** GLX_MESA_agp_offset */ + +GLuint PUBLIC +glXGetAGPOffsetMESA( const GLvoid *pointer ) +{ + struct _glxapi_table *t; + Display *dpy = glXGetCurrentDisplay(); + GET_DISPATCH(dpy, t); + if (!t) + return ~0; + return (t->GetAGPOffsetMESA)(pointer); +} + + +/*** GLX_EXT_texture_from_pixmap */ + +void PUBLIC +glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, + const int *attrib_list) +{ + struct _glxapi_table *t; + GET_DISPATCH(dpy, t); + if (t) + t->BindTexImageEXT(dpy, drawable, buffer, attrib_list); +} + +void PUBLIC +glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer) +{ + struct _glxapi_table *t; + GET_DISPATCH(dpy, t); + if (t) + t->ReleaseTexImageEXT(dpy, drawable, buffer); +} + /**********************************************************************/ /* GLX API management functions */ @@ -1022,6 +1168,18 @@ _glxapi_get_extensions(void) #endif #ifdef GLX_MESA_set_3dfx_mode "GLX_MESA_set_3dfx_mode", +#endif +#ifdef GLX_SGIX_fbconfig + "GLX_SGIX_fbconfig", +#endif +#ifdef GLX_SGIX_pbuffer + "GLX_SGIX_pbuffer", +#endif +#ifdef GLX_EXT_texture_from_pixmap + "GLX_EXT_texture_from_pixmap", +#endif +#ifdef GLX_INTEL_swap_event + "GLX_INTEL_swap_event", #endif NULL }; @@ -1052,282 +1210,160 @@ generic_no_op_func(void) void _glxapi_set_no_op_table(struct _glxapi_table *t) { + typedef int (*nop_func)(void); + nop_func *dispatch = (nop_func *) t; GLuint n = _glxapi_get_dispatch_table_size(); GLuint i; - void **dispatch = (void **) t; for (i = 0; i < n; i++) { - dispatch[i] = (void *) generic_no_op_func; - } -} - - -#if 00 -/* - * Open the named library and use dlsym() to populate the given dispatch - * table with GLX function pointers. - * Return: true = all OK - * false = can't open libName or can't get required GLX function - */ -GLboolean -_glxapi_load_library_table(const char *libName, struct _glxapi_table *t) -{ - void *libHandle; - void **entry; /* used to avoid a lot of cast/type warnings */ - - libHandle = dlopen(libName, 0); - if (!libHandle) { - return GL_FALSE; + dispatch[i] = generic_no_op_func; } - -#define GET_REQ_FUNCTION(ENTRY, NAME) \ - entry = (void **) &(t->ENTRY); \ - *entry = dlsym(libHandle, NAME); \ - if (!*entry) { \ - fprintf(stderr, "libGL Error: couldn't load %s from %s\n", \ - NAME, libName); \ - dlclose(libHandle); \ - return GL_FALSE; \ - } - - /* 1.0 and 1.1 functions */ - GET_REQ_FUNCTION(ChooseVisual, "glXChooseVisual"); - GET_REQ_FUNCTION(CopyContext, "glXCopyContext"); - GET_REQ_FUNCTION(CreateContext, "glXCreateContext"); - GET_REQ_FUNCTION(CreateGLXPixmap, "glXCreateGLXPixmap"); - GET_REQ_FUNCTION(DestroyContext, "glXDestroyContext"); - GET_REQ_FUNCTION(GetConfig, "glXGetConfig"); - GET_REQ_FUNCTION(IsDirect, "glXIsDirect"); - GET_REQ_FUNCTION(MakeCurrent, "glXMakeCurrent"); - GET_REQ_FUNCTION(QueryExtension, "glXQueryExtension"); - GET_REQ_FUNCTION(QueryVersion, "glXQueryVersion"); - GET_REQ_FUNCTION(SwapBuffers, "glXSwapBuffers"); - GET_REQ_FUNCTION(UseXFont, "glXUseXFont"); - GET_REQ_FUNCTION(WaitGL, "glXWaitGL"); - GET_REQ_FUNCTION(WaitX, "glXWaitX"); - GET_REQ_FUNCTION(GetClientString, "glXGetClientString"); - GET_REQ_FUNCTION(QueryExtensionsString, "glXQueryExtensionsString"); - GET_REQ_FUNCTION(QueryServerString, "glXQueryServerString"); - -#define GET_OPT_FUNCTION(ENTRY, NAME) \ - entry = (void **) &(t->ENTRY); \ - *entry = dlsym(libHandle, NAME); \ - if (!*entry) { \ - *entry = (void *) generic_no_op_func; \ - } - - /* 1.2, 1.3 and extensions */ - GET_OPT_FUNCTION(ChooseFBConfig, "glXChooseFBConfig"); - GET_OPT_FUNCTION(CreateNewContext, "glXCreateNewContext"); - GET_OPT_FUNCTION(CreatePbuffer, "glXCreatePbuffer"); - GET_OPT_FUNCTION(CreatePixmap, "glXCreatePixmap"); - GET_OPT_FUNCTION(CreateWindow, "glXCreateWindow"); - GET_OPT_FUNCTION(DestroyPbuffer, "glXDestroyPbuffer"); - GET_OPT_FUNCTION(DestroyPixmap, "glXDestroyPixmap"); - GET_OPT_FUNCTION(DestroyWindow, "glXDestroyWindow"); - GET_OPT_FUNCTION(GetFBConfigAttrib, "glXGetFBConfigAttrib"); - GET_OPT_FUNCTION(GetFBConfigs, "glXGetFBConfigs"); - GET_OPT_FUNCTION(GetSelectedEvent, "glXGetSelectedEvent"); - GET_OPT_FUNCTION(GetVisualFromFBConfig, "glXGetVisualFromFBConfig"); - GET_OPT_FUNCTION(MakeContextCurrent, "glXMakeContextCurrent"); - GET_OPT_FUNCTION(QueryContext, "glXQueryContext"); - GET_OPT_FUNCTION(QueryDrawable, "glXQueryDrawable"); - GET_OPT_FUNCTION(SelectEvent, "glXSelectEvent"); - /*** GLX_SGI_swap_control ***/ - GET_OPT_FUNCTION(SwapIntervalSGI, "glXSwapIntervalSGI"); - /*** GLX_SGI_video_sync ***/ - GET_OPT_FUNCTION(GetVideoSyncSGI, "glXGetVideoSyncSGI"); - GET_OPT_FUNCTION(WaitVideoSyncSGI, "glXWaitVideoSyncSGI"); - /*** GLX_SGI_make_current_read ***/ - GET_OPT_FUNCTION(MakeCurrentReadSGI, "glXMakeCurrentReadSGI"); - GET_OPT_FUNCTION(GetCurrentReadDrawableSGI, "glXGetCurrentReadDrawableSGI"); - /*** GLX_SGIX_video_source ***/ -#if defined(_VL_H) - GET_OPT_FUNCTION(CreateGLXVideoSourceSGIX, "glXCreateGLXVideoSourceSGIX"); - GET_OPT_FUNCTION(DestroyGLXVideoSourceSGIX, "glXDestroyGLXVideoSourceSGIX"); -#endif - /*** GLX_EXT_import_context ***/ - GET_OPT_FUNCTION(FreeContextEXT, "glXFreeContextEXT"); - GET_OPT_FUNCTION(GetContextIDEXT, "glXGetContextIDEXT"); - GET_OPT_FUNCTION(GetCurrentDisplayEXT, "glXGetCurrentDisplayEXT"); - GET_OPT_FUNCTION(ImportContextEXT, "glXImportContextEXT"); - GET_OPT_FUNCTION(QueryContextInfoEXT, "glXQueryContextInfoEXT"); - /*** GLX_SGIX_fbconfig ***/ - GET_OPT_FUNCTION(GetFBConfigAttribSGIX, "glXGetFBConfigAttribSGIX"); - GET_OPT_FUNCTION(ChooseFBConfigSGIX, "glXChooseFBConfigSGIX"); - GET_OPT_FUNCTION(CreateGLXPixmapWithConfigSGIX, "glXCreateGLXPixmapWithConfigSGIX"); - GET_OPT_FUNCTION(CreateContextWithConfigSGIX, "glXCreateContextWithConfigSGIX"); - GET_OPT_FUNCTION(GetVisualFromFBConfigSGIX, "glXGetVisualFromFBConfigSGIX"); - GET_OPT_FUNCTION(GetFBConfigFromVisualSGIX, "glXGetFBConfigFromVisualSGIX"); - /*** GLX_SGIX_pbuffer ***/ - GET_OPT_FUNCTION(CreateGLXPbufferSGIX, "glXCreateGLXPbufferSGIX"); - GET_OPT_FUNCTION(DestroyGLXPbufferSGIX, "glXDestroyGLXPbufferSGIX"); - GET_OPT_FUNCTION(QueryGLXPbufferSGIX, "glXQueryGLXPbufferSGIX"); - GET_OPT_FUNCTION(SelectEventSGIX, "glXSelectEventSGIX"); - GET_OPT_FUNCTION(GetSelectedEventSGIX, "glXGetSelectedEventSGIX"); - /*** GLX_SGI_cushion ***/ - GET_OPT_FUNCTION(CushionSGI, "glXCushionSGI"); - /*** GLX_SGIX_video_resize ***/ - GET_OPT_FUNCTION(BindChannelToWindowSGIX, "glXBindChannelToWindowSGIX"); - GET_OPT_FUNCTION(ChannelRectSGIX, "glXChannelRectSGIX"); - GET_OPT_FUNCTION(QueryChannelRectSGIX, "glXQueryChannelRectSGIX"); - GET_OPT_FUNCTION(QueryChannelDeltasSGIX, "glXQueryChannelDeltasSGIX"); - GET_OPT_FUNCTION(ChannelRectSyncSGIX, "glXChannelRectSyncSGIX"); - /*** GLX_SGIX_dmbuffer ***/ -#if defined (_DM_BUFFER_H_) - GET_OPT_FUNCTION(AssociateDMPbufferSGIX, "glXAssociateDMPbufferSGIX"); -#endif - /*** GLX_SGIX_swap_group ***/ - GET_OPT_FUNCTION(JoinSwapGroupSGIX, "glXJoinSwapGroupSGIX"); - /*** GLX_SGIX_swap_barrier ***/ - GET_OPT_FUNCTION(BindSwapBarrierSGIX, "glXBindSwapBarrierSGIX"); - GET_OPT_FUNCTION(QueryMaxSwapBarriersSGIX, "glXQueryMaxSwapBarriersSGIX"); - /*** GLX_SUN_get_transparent_index ***/ - GET_OPT_FUNCTION(GetTransparentIndexSUN, "glXGetTransparentIndexSUN"); - /*** GLX_MESA_copy_sub_buffer ***/ - GET_OPT_FUNCTION(CopySubBufferMESA, "glXCopySubBufferMESA"); - /*** GLX_MESA_release_buffers ***/ - GET_OPT_FUNCTION(ReleaseBuffersMESA, "glXReleaseBuffersMESA"); - /*** GLX_MESA_pixmap_colormap ***/ - GET_OPT_FUNCTION(CreateGLXPixmapMESA, "glXCreateGLXPixmapMESA"); - /*** GLX_MESA_set_3dfx_mode ***/ - GET_OPT_FUNCTION(Set3DfxModeMESA, "glXSet3DfxModeMESA"); - - return GL_TRUE; } -#endif - struct name_address_pair { const char *Name; - GLvoid *Address; + __GLXextFuncPtr Address; }; static struct name_address_pair GLX_functions[] = { /*** GLX_VERSION_1_0 ***/ - { "glXChooseVisual", (GLvoid *) glXChooseVisual }, - { "glXCopyContext", (GLvoid *) glXCopyContext }, - { "glXCreateContext", (GLvoid *) glXCreateContext }, - { "glXCreateGLXPixmap", (GLvoid *) glXCreateGLXPixmap }, - { "glXDestroyContext", (GLvoid *) glXDestroyContext }, - { "glXDestroyGLXPixmap", (GLvoid *) glXDestroyGLXPixmap }, - { "glXGetConfig", (GLvoid *) glXGetConfig }, - { "glXGetCurrentContext", (GLvoid *) glXGetCurrentContext }, - { "glXGetCurrentDrawable", (GLvoid *) glXGetCurrentDrawable }, - { "glXIsDirect", (GLvoid *) glXIsDirect }, - { "glXMakeCurrent", (GLvoid *) glXMakeCurrent }, - { "glXQueryExtension", (GLvoid *) glXQueryExtension }, - { "glXQueryVersion", (GLvoid *) glXQueryVersion }, - { "glXSwapBuffers", (GLvoid *) glXSwapBuffers }, - { "glXUseXFont", (GLvoid *) glXUseXFont }, - { "glXWaitGL", (GLvoid *) glXWaitGL }, - { "glXWaitX", (GLvoid *) glXWaitX }, + { "glXChooseVisual", (__GLXextFuncPtr) glXChooseVisual }, + { "glXCopyContext", (__GLXextFuncPtr) glXCopyContext }, + { "glXCreateContext", (__GLXextFuncPtr) glXCreateContext }, + { "glXCreateGLXPixmap", (__GLXextFuncPtr) glXCreateGLXPixmap }, + { "glXDestroyContext", (__GLXextFuncPtr) glXDestroyContext }, + { "glXDestroyGLXPixmap", (__GLXextFuncPtr) glXDestroyGLXPixmap }, + { "glXGetConfig", (__GLXextFuncPtr) glXGetConfig }, + { "glXGetCurrentContext", (__GLXextFuncPtr) glXGetCurrentContext }, + { "glXGetCurrentDrawable", (__GLXextFuncPtr) glXGetCurrentDrawable }, + { "glXIsDirect", (__GLXextFuncPtr) glXIsDirect }, + { "glXMakeCurrent", (__GLXextFuncPtr) glXMakeCurrent }, + { "glXQueryExtension", (__GLXextFuncPtr) glXQueryExtension }, + { "glXQueryVersion", (__GLXextFuncPtr) glXQueryVersion }, + { "glXSwapBuffers", (__GLXextFuncPtr) glXSwapBuffers }, + { "glXUseXFont", (__GLXextFuncPtr) glXUseXFont }, + { "glXWaitGL", (__GLXextFuncPtr) glXWaitGL }, + { "glXWaitX", (__GLXextFuncPtr) glXWaitX }, /*** GLX_VERSION_1_1 ***/ - { "glXGetClientString", (GLvoid *) glXGetClientString }, - { "glXQueryExtensionsString", (GLvoid *) glXQueryExtensionsString }, - { "glXQueryServerString", (GLvoid *) glXQueryServerString }, + { "glXGetClientString", (__GLXextFuncPtr) glXGetClientString }, + { "glXQueryExtensionsString", (__GLXextFuncPtr) glXQueryExtensionsString }, + { "glXQueryServerString", (__GLXextFuncPtr) glXQueryServerString }, /*** GLX_VERSION_1_2 ***/ - { "glXGetCurrentDisplay", (GLvoid *) glXGetCurrentDisplay }, + { "glXGetCurrentDisplay", (__GLXextFuncPtr) glXGetCurrentDisplay }, /*** GLX_VERSION_1_3 ***/ - { "glXChooseFBConfig", (GLvoid *) glXChooseFBConfig }, - { "glXCreateNewContext", (GLvoid *) glXCreateNewContext }, - { "glXCreatePbuffer", (GLvoid *) glXCreatePbuffer }, - { "glXCreatePixmap", (GLvoid *) glXCreatePixmap }, - { "glXCreateWindow", (GLvoid *) glXCreateWindow }, - { "glXDestroyPbuffer", (GLvoid *) glXDestroyPbuffer }, - { "glXDestroyPixmap", (GLvoid *) glXDestroyPixmap }, - { "glXDestroyWindow", (GLvoid *) glXDestroyWindow }, - { "glXGetCurrentReadDrawable", (GLvoid *) glXGetCurrentReadDrawable }, - { "glXGetFBConfigAttrib", (GLvoid *) glXGetFBConfigAttrib }, - { "glXGetFBConfigs", (GLvoid *) glXGetFBConfigs }, - { "glXGetSelectedEvent", (GLvoid *) glXGetSelectedEvent }, - { "glXGetVisualFromFBConfig", (GLvoid *) glXGetVisualFromFBConfig }, - { "glXMakeContextCurrent", (GLvoid *) glXMakeContextCurrent }, - { "glXQueryContext", (GLvoid *) glXQueryContext }, - { "glXQueryDrawable", (GLvoid *) glXQueryDrawable }, - { "glXSelectEvent", (GLvoid *) glXSelectEvent }, + { "glXChooseFBConfig", (__GLXextFuncPtr) glXChooseFBConfig }, + { "glXCreateNewContext", (__GLXextFuncPtr) glXCreateNewContext }, + { "glXCreatePbuffer", (__GLXextFuncPtr) glXCreatePbuffer }, + { "glXCreatePixmap", (__GLXextFuncPtr) glXCreatePixmap }, + { "glXCreateWindow", (__GLXextFuncPtr) glXCreateWindow }, + { "glXDestroyPbuffer", (__GLXextFuncPtr) glXDestroyPbuffer }, + { "glXDestroyPixmap", (__GLXextFuncPtr) glXDestroyPixmap }, + { "glXDestroyWindow", (__GLXextFuncPtr) glXDestroyWindow }, + { "glXGetCurrentReadDrawable", (__GLXextFuncPtr) glXGetCurrentReadDrawable }, + { "glXGetFBConfigAttrib", (__GLXextFuncPtr) glXGetFBConfigAttrib }, + { "glXGetFBConfigs", (__GLXextFuncPtr) glXGetFBConfigs }, + { "glXGetSelectedEvent", (__GLXextFuncPtr) glXGetSelectedEvent }, + { "glXGetVisualFromFBConfig", (__GLXextFuncPtr) glXGetVisualFromFBConfig }, + { "glXMakeContextCurrent", (__GLXextFuncPtr) glXMakeContextCurrent }, + { "glXQueryContext", (__GLXextFuncPtr) glXQueryContext }, + { "glXQueryDrawable", (__GLXextFuncPtr) glXQueryDrawable }, + { "glXSelectEvent", (__GLXextFuncPtr) glXSelectEvent }, + + /*** GLX_VERSION_1_4 ***/ + { "glXGetProcAddress", (__GLXextFuncPtr) glXGetProcAddress }, /*** GLX_SGI_swap_control ***/ - { "glXSwapIntervalSGI", (GLvoid *) glXSwapIntervalSGI }, + { "glXSwapIntervalSGI", (__GLXextFuncPtr) glXSwapIntervalSGI }, /*** GLX_SGI_video_sync ***/ - { "glXGetVideoSyncSGI", (GLvoid *) glXGetVideoSyncSGI }, - { "glXWaitVideoSyncSGI", (GLvoid *) glXWaitVideoSyncSGI }, + { "glXGetVideoSyncSGI", (__GLXextFuncPtr) glXGetVideoSyncSGI }, + { "glXWaitVideoSyncSGI", (__GLXextFuncPtr) glXWaitVideoSyncSGI }, /*** GLX_SGI_make_current_read ***/ - { "glXMakeCurrentReadSGI", (GLvoid *) glXMakeCurrentReadSGI }, - { "glXGetCurrentReadDrawableSGI", (GLvoid *) glXGetCurrentReadDrawableSGI }, + { "glXMakeCurrentReadSGI", (__GLXextFuncPtr) glXMakeCurrentReadSGI }, + { "glXGetCurrentReadDrawableSGI", (__GLXextFuncPtr) glXGetCurrentReadDrawableSGI }, /*** GLX_SGIX_video_source ***/ #if defined(_VL_H) - { "glXCreateGLXVideoSourceSGIX", (GLvoid *) glXCreateGLXVideoSourceSGIX }, - { "glXDestroyGLXVideoSourceSGIX", (GLvoid *) glXDestroyGLXVideoSourceSGIX }, + { "glXCreateGLXVideoSourceSGIX", (__GLXextFuncPtr) glXCreateGLXVideoSourceSGIX }, + { "glXDestroyGLXVideoSourceSGIX", (__GLXextFuncPtr) glXDestroyGLXVideoSourceSGIX }, #endif /*** GLX_EXT_import_context ***/ - { "glXFreeContextEXT", (GLvoid *) glXFreeContextEXT }, - { "glXGetContextIDEXT", (GLvoid *) glXGetContextIDEXT }, - { "glXGetCurrentDisplayEXT", (GLvoid *) glXGetCurrentDisplayEXT }, - { "glXImportContextEXT", (GLvoid *) glXImportContextEXT }, - { "glXQueryContextInfoEXT", (GLvoid *) glXQueryContextInfoEXT }, + { "glXFreeContextEXT", (__GLXextFuncPtr) glXFreeContextEXT }, + { "glXGetContextIDEXT", (__GLXextFuncPtr) glXGetContextIDEXT }, + { "glXGetCurrentDisplayEXT", (__GLXextFuncPtr) glXGetCurrentDisplayEXT }, + { "glXImportContextEXT", (__GLXextFuncPtr) glXImportContextEXT }, + { "glXQueryContextInfoEXT", (__GLXextFuncPtr) glXQueryContextInfoEXT }, /*** GLX_SGIX_fbconfig ***/ - { "glXGetFBConfigAttribSGIX", (GLvoid *) glXGetFBConfigAttribSGIX }, - { "glXChooseFBConfigSGIX", (GLvoid *) glXChooseFBConfigSGIX }, - { "glXCreateGLXPixmapWithConfigSGIX", (GLvoid *) glXCreateGLXPixmapWithConfigSGIX }, - { "glXCreateContextWithConfigSGIX", (GLvoid *) glXCreateContextWithConfigSGIX }, - { "glXGetVisualFromFBConfigSGIX", (GLvoid *) glXGetVisualFromFBConfigSGIX }, - { "glXGetFBConfigFromVisualSGIX", (GLvoid *) glXGetFBConfigFromVisualSGIX }, + { "glXGetFBConfigAttribSGIX", (__GLXextFuncPtr) glXGetFBConfigAttribSGIX }, + { "glXChooseFBConfigSGIX", (__GLXextFuncPtr) glXChooseFBConfigSGIX }, + { "glXCreateGLXPixmapWithConfigSGIX", (__GLXextFuncPtr) glXCreateGLXPixmapWithConfigSGIX }, + { "glXCreateContextWithConfigSGIX", (__GLXextFuncPtr) glXCreateContextWithConfigSGIX }, + { "glXGetVisualFromFBConfigSGIX", (__GLXextFuncPtr) glXGetVisualFromFBConfigSGIX }, + { "glXGetFBConfigFromVisualSGIX", (__GLXextFuncPtr) glXGetFBConfigFromVisualSGIX }, /*** GLX_SGIX_pbuffer ***/ - { "glXCreateGLXPbufferSGIX", (GLvoid *) glXCreateGLXPbufferSGIX }, - { "glXDestroyGLXPbufferSGIX", (GLvoid *) glXDestroyGLXPbufferSGIX }, - { "glXQueryGLXPbufferSGIX", (GLvoid *) glXQueryGLXPbufferSGIX }, - { "glXSelectEventSGIX", (GLvoid *) glXSelectEventSGIX }, - { "glXGetSelectedEventSGIX", (GLvoid *) glXGetSelectedEventSGIX }, + { "glXCreateGLXPbufferSGIX", (__GLXextFuncPtr) glXCreateGLXPbufferSGIX }, + { "glXDestroyGLXPbufferSGIX", (__GLXextFuncPtr) glXDestroyGLXPbufferSGIX }, + { "glXQueryGLXPbufferSGIX", (__GLXextFuncPtr) glXQueryGLXPbufferSGIX }, + { "glXSelectEventSGIX", (__GLXextFuncPtr) glXSelectEventSGIX }, + { "glXGetSelectedEventSGIX", (__GLXextFuncPtr) glXGetSelectedEventSGIX }, /*** GLX_SGI_cushion ***/ - { "glXCushionSGI", (GLvoid *) glXCushionSGI }, + { "glXCushionSGI", (__GLXextFuncPtr) glXCushionSGI }, /*** GLX_SGIX_video_resize ***/ - { "glXBindChannelToWindowSGIX", (GLvoid *) glXBindChannelToWindowSGIX }, - { "glXChannelRectSGIX", (GLvoid *) glXChannelRectSGIX }, - { "glXQueryChannelRectSGIX", (GLvoid *) glXQueryChannelRectSGIX }, - { "glXQueryChannelDeltasSGIX", (GLvoid *) glXQueryChannelDeltasSGIX }, - { "glXChannelRectSyncSGIX", (GLvoid *) glXChannelRectSyncSGIX }, + { "glXBindChannelToWindowSGIX", (__GLXextFuncPtr) glXBindChannelToWindowSGIX }, + { "glXChannelRectSGIX", (__GLXextFuncPtr) glXChannelRectSGIX }, + { "glXQueryChannelRectSGIX", (__GLXextFuncPtr) glXQueryChannelRectSGIX }, + { "glXQueryChannelDeltasSGIX", (__GLXextFuncPtr) glXQueryChannelDeltasSGIX }, + { "glXChannelRectSyncSGIX", (__GLXextFuncPtr) glXChannelRectSyncSGIX }, /*** GLX_SGIX_dmbuffer **/ #if defined(_DM_BUFFER_H_) - { "glXAssociateDMPbufferSGIX", (GLvoid *) glXAssociateDMPbufferSGIX }, + { "glXAssociateDMPbufferSGIX", (__GLXextFuncPtr) glXAssociateDMPbufferSGIX }, #endif /*** GLX_SGIX_swap_group ***/ - { "glXJoinSwapGroupSGIX", (GLvoid *) glXJoinSwapGroupSGIX }, + { "glXJoinSwapGroupSGIX", (__GLXextFuncPtr) glXJoinSwapGroupSGIX }, /*** GLX_SGIX_swap_barrier ***/ - { "glXBindSwapBarrierSGIX", (GLvoid *) glXBindSwapBarrierSGIX }, - { "glXQueryMaxSwapBarriersSGIX", (GLvoid *) glXQueryMaxSwapBarriersSGIX }, + { "glXBindSwapBarrierSGIX", (__GLXextFuncPtr) glXBindSwapBarrierSGIX }, + { "glXQueryMaxSwapBarriersSGIX", (__GLXextFuncPtr) glXQueryMaxSwapBarriersSGIX }, /*** GLX_SUN_get_transparent_index ***/ - { "glXGetTransparentIndexSUN", (GLvoid *) glXGetTransparentIndexSUN }, + { "glXGetTransparentIndexSUN", (__GLXextFuncPtr) glXGetTransparentIndexSUN }, /*** GLX_MESA_copy_sub_buffer ***/ - { "glXCopySubBufferMESA", (GLvoid *) glXCopySubBufferMESA }, + { "glXCopySubBufferMESA", (__GLXextFuncPtr) glXCopySubBufferMESA }, /*** GLX_MESA_pixmap_colormap ***/ - { "glXCreateGLXPixmapMESA", (GLvoid *) glXCreateGLXPixmapMESA }, + { "glXCreateGLXPixmapMESA", (__GLXextFuncPtr) glXCreateGLXPixmapMESA }, /*** GLX_MESA_release_buffers ***/ - { "glXReleaseBuffersMESA", (GLvoid *) glXReleaseBuffersMESA }, + { "glXReleaseBuffersMESA", (__GLXextFuncPtr) glXReleaseBuffersMESA }, /*** GLX_MESA_set_3dfx_mode ***/ - { "glXSet3DfxModeMESA", (GLvoid *) glXSet3DfxModeMESA }, + { "glXSet3DfxModeMESA", (__GLXextFuncPtr) glXSet3DfxModeMESA }, /*** GLX_ARB_get_proc_address ***/ - { "glXGetProcAddressARB", (GLvoid *) glXGetProcAddressARB }, + { "glXGetProcAddressARB", (__GLXextFuncPtr) glXGetProcAddressARB }, + + /*** GLX_NV_vertex_array_range ***/ + { "glXAllocateMemoryNV", (__GLXextFuncPtr) glXAllocateMemoryNV }, + { "glXFreeMemoryNV", (__GLXextFuncPtr) glXFreeMemoryNV }, + + /*** GLX_MESA_agp_offset ***/ + { "glXGetAGPOffsetMESA", (__GLXextFuncPtr) glXGetAGPOffsetMESA }, + + /*** GLX_EXT_texture_from_pixmap ***/ + { "glXBindTexImageEXT", (__GLXextFuncPtr) glXBindTexImageEXT }, + { "glXReleaseTexImageEXT", (__GLXextFuncPtr) glXReleaseTexImageEXT }, { NULL, NULL } /* end of list */ }; @@ -1337,12 +1373,17 @@ static struct name_address_pair GLX_functions[] = { /* * Return address of named glX function, or NULL if not found. */ -const GLvoid * +__GLXextFuncPtr _glxapi_get_proc_address(const char *funcName) { GLuint i; for (i = 0; GLX_functions[i].Name; i++) { +#ifdef MANGLE + /* skip the "m" prefix on the name */ + if (strcmp(GLX_functions[i].Name, funcName+1) == 0) +#else if (strcmp(GLX_functions[i].Name, funcName) == 0) +#endif return GLX_functions[i].Address; } return NULL; @@ -1354,16 +1395,24 @@ _glxapi_get_proc_address(const char *funcName) * This function does not get dispatched through the dispatch table * since it's really a "meta" function. */ -void (*glXGetProcAddressARB(const GLubyte *procName))() +__GLXextFuncPtr PUBLIC +glXGetProcAddressARB(const GLubyte *procName) { - typedef void (*gl_function)(); - gl_function f; + __GLXextFuncPtr f; - f = (gl_function) _glxapi_get_proc_address((const char *) procName); + f = _glxapi_get_proc_address((const char *) procName); if (f) { return f; } - f = (gl_function) _glapi_get_proc_address((const char *) procName); + f = (__GLXextFuncPtr) _glapi_get_proc_address((const char *) procName); return f; } + + +/* GLX 1.4 */ +void PUBLIC +(*glXGetProcAddress(const GLubyte *procName))() +{ + return glXGetProcAddressARB(procName); +}