Merge branch '7.8'

[mesa.git] / src / mesa / glapi / glapi.h

diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index 7cdccc1275829b7330b9900695346fd4a6629e51..7dcf2e8910b2fe0201b6664ebb8e3e6f5e9d320c 100644 (file)
--- a/src/mesa/glapi/glapi.h
+++ b/src/mesa/glapi/glapi.h
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  7.1
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  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"),
@@ -44,26 +44,90 @@
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
+#include "glthread.h"
 
-#include "GL/gl.h"
 
 struct _glapi_table;
 
-typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
-
 typedef void (*_glapi_proc)(void); /* generic function pointer */
 
 
-extern void *_glapi_Context;
+#if defined(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_Dispatch _mglapi_Dispatch
+#define _glapi_Context _mglapi_Context
+#endif
+
+
+#if defined(__GNUC__)
+#  define likely(x)   __builtin_expect(!!(x), 1)
+#  define unlikely(x) __builtin_expect(!!(x), 0)
+#else
+#  define likely(x)   (x)
+#  define unlikely(x) (x)
+#endif
+
+
+/**
+ ** Define the GET_DISPATCH() and GET_CURRENT_CONTEXT() macros.
+ **
+ ** \param C local variable which will hold the current context.
+ **/
+#if defined (GLX_USE_TLS)
+
+extern const struct _glapi_table *_glapi_Dispatch;
+
+extern const void *_glapi_Context;
+
+extern __thread struct _glapi_table * _glapi_tls_Dispatch
+    __attribute__((tls_model("initial-exec")));
+
+extern __thread void * _glapi_tls_Context
+    __attribute__((tls_model("initial-exec")));
+
+# define GET_DISPATCH() _glapi_tls_Dispatch
+
+# define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_tls_Context
+
+#else
 
 extern struct _glapi_table *_glapi_Dispatch;
 
+extern void *_glapi_Context;
+
+# ifdef THREADS
+
+#  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
+ **/
 
 extern void
-_glapi_noop_enable_warnings(GLboolean enable);
+_glapi_init_multithread(void);
+
 
 extern void
-_glapi_set_warning_func(_glapi_warning_func func);
+_glapi_destroy_multithread(void);
+
 
 extern void
 _glapi_check_multithread(void);
@@ -85,44 +149,24 @@ extern 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);
-
-
-struct _glapi_table *
-_glapi_get_override_dispatch(int layer);
-
-
-extern GLuint
+extern unsigned int
 _glapi_get_dispatch_table_size(void);
 
 
-extern const char *
-_glapi_get_version(void);
-
-
-extern void
-_glapi_check_table(const struct _glapi_table *table);
-
-
-extern GLboolean
-_glapi_add_entrypoint(const char *funcName, GLuint offset);
-
+extern int
+_glapi_add_dispatch( const char * const * function_names,
+                    const char * parameter_signature );
 
-extern GLint
+extern int
 _glapi_get_proc_offset(const char *funcName);
 
 
-extern const _glapi_proc
+extern _glapi_proc
 _glapi_get_proc_address(const char *funcName);
 
 
 extern const char *
-_glapi_get_proc_name(GLuint offset);
+_glapi_get_proc_name(unsigned int offset);
 
 
 #endif