diff options
Diffstat (limited to 'xorg-server/glx/glapi.h')
| -rw-r--r-- | xorg-server/glx/glapi.h | 146 |
1 files changed, 80 insertions, 66 deletions
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h index 8f2cf6621..b404dd617 100644 --- a/xorg-server/glx/glapi.h +++ b/xorg-server/glx/glapi.h @@ -39,133 +39,147 @@ * This module is intended to be non-Mesa-specific so it can be used * with the X/DRI libGL also. */ - - #ifndef _GLAPI_H #define _GLAPI_H -#define GL_GLEXT_PROTOTYPES - -#include "GL/gl.h" -#include "GL/glext.h" -#include "glthread.h" - - -struct _glapi_table; - -typedef void (*_glapi_proc)(void); /* generic function pointer */ - -typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...); - +/* opengl.dll does not export _glapi_* */ +#if defined(_WIN32) +#define _GLAPI_NO_EXPORTS +#endif -#if defined(USE_MGL_NAMESPACE) +#ifdef _GLAPI_NO_EXPORTS +# define _GLAPI_EXPORT +#else /* _GLAPI_NO_EXPORTS */ +# ifdef _WIN32 +# ifdef _GLAPI_DLL_EXPORTS +# define _GLAPI_EXPORT __declspec(dllexport) +# else +# define _GLAPI_EXPORT __declspec(dllimport) +# endif +# elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) +# define _GLAPI_EXPORT __attribute__((visibility("default"))) +# else +# define _GLAPI_EXPORT +# endif +#endif /* _GLAPI_NO_EXPORTS */ + + +/* Is this needed? It is incomplete anyway. */ +#ifdef USE_MGL_NAMESPACE #define _glapi_set_dispatch _mglapi_set_dispatch #define _glapi_get_dispatch _mglapi_get_dispatch #define _glapi_set_context _mglapi_set_context #define _glapi_get_context _mglapi_get_context -#define _glapi_Context _mglapi_Context #define _glapi_Dispatch _mglapi_Dispatch +#define _glapi_Context _mglapi_Context #endif +#include "glthread.h" -/* - * Number of extension functions which we can dynamically add at runtime. - */ -#define MAX_EXTENSION_FUNCS 300 +typedef void (*_glapi_proc)(void); +struct _glapi_table; -/** - ** Define the GET_CURRENT_CONTEXT() macro. - ** \param C local variable which will hold the current context. - **/ #if defined (GLX_USE_TLS) -const extern void *_glapi_Context; -const extern struct _glapi_table *_glapi_Dispatch; +_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch + __attribute__((tls_model("initial-exec"))); -extern __thread void * _glapi_tls_Context +_GLAPI_EXPORT extern __thread void * _glapi_tls_Context __attribute__((tls_model("initial-exec"))); +_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch; +_GLAPI_EXPORT extern const void *_glapi_Context; + +# define GET_DISPATCH() _glapi_tls_Dispatch # define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) _glapi_tls_Context #else -extern void *_glapi_Context; -extern struct _glapi_table *_glapi_Dispatch; +#ifdef INSERVER +#define SERVEXTERN _declspec(dllimport) +#else +#define SERVEXTERN _declspec(dllexport) +#endif + +SERVEXTERN struct _glapi_table *_glapi_Dispatch; +SERVEXTERN void *_glapi_Context; # ifdef THREADS -# define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context()) + +# define GET_DISPATCH() \ + (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch()) + +# define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) \ + (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context()) + # else + +# define GET_DISPATCH() _glapi_Dispatch # define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) _glapi_Context + # endif #endif /* defined (GLX_USE_TLS) */ -/** - ** GL API public functions - **/ +void +_glapi_destroy_multithread(void); -extern void -_glapi_noop_enable_warnings(GLboolean enable); -extern void -_glapi_set_warning_func(_glapi_warning_func func); - -extern void +SERVEXTERN void _glapi_check_multithread(void); -extern void +SERVEXTERN void _glapi_set_context(void *context); -extern void * +SERVEXTERN void * _glapi_get_context(void); -extern void +SERVEXTERN void _glapi_set_dispatch(struct _glapi_table *dispatch); -extern struct _glapi_table * +SERVEXTERN struct _glapi_table * _glapi_get_dispatch(void); -extern int -_glapi_begin_dispatch_override(struct _glapi_table *override); - - -extern void -_glapi_end_dispatch_override(int layer); +SERVEXTERN unsigned int +_glapi_get_dispatch_table_size(void); -struct _glapi_table * -_glapi_get_override_dispatch(int layer); +SERVEXTERN int +_glapi_add_dispatch( const char * const * function_names, + const char * parameter_signature ); +_GLAPI_EXPORT int +_glapi_get_proc_offset(const char *funcName); -extern GLuint -_glapi_get_dispatch_table_size(void); +_GLAPI_EXPORT _glapi_proc +_glapi_get_proc_address(const char *funcName); -extern void -_glapi_check_table(const struct _glapi_table *table); +_GLAPI_EXPORT const char * +_glapi_get_proc_name(unsigned int offset); -extern int -_glapi_add_dispatch( const char * const * function_names, - const char * parameter_signature ); -extern GLint -_glapi_get_proc_offset(const char *funcName); +_GLAPI_EXPORT unsigned long +_glthread_GetID(void); -extern _glapi_proc -_glapi_get_proc_address(const char *funcName); +/* + * These stubs are kept so that the old DRI drivers still load. + */ +SERVEXTERN void +_glapi_noop_enable_warnings(unsigned char enable); -extern const char * -_glapi_get_proc_name(GLuint offset); +_GLAPI_EXPORT void +_glapi_set_warning_func(_glapi_proc func); -#endif +#endif /* _GLAPI_H */ |