X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fglapi%2Fglapi.h;h=8f2cf66218389edf0eea852661f46bf3f8b9d067;hb=56c4226fcc54158eb7fe54eeb13539a979ec155c;hp=c334203394f1203487316124662a792685c512e2;hpb=545515cbea96d1653f1953b57fc813417ca46efc;p=mesa.git

diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index c334203394f..8f2cf662183 100644
--- 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,16 +44,40 @@
 #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, ...);
 
-typedef void (*_glapi_proc)(void); /* generic function pointer */
+
+#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_Context _mglapi_Context
+#define _glapi_Dispatch _mglapi_Dispatch
+#endif
 
 
+/*
+ * Number of extension functions which we can dynamically add at runtime.
+ */
+#define MAX_EXTENSION_FUNCS 300
+
+
+/**
+ ** 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;
@@ -69,19 +93,6 @@ extern __thread void * _glapi_tls_Context
 extern void *_glapi_Context;
 extern struct _glapi_table *_glapi_Dispatch;
 
-/**
- * Macro for declaration and fetching the current context.
- *
- * \param C local variable which will hold the current context.
- *
- * It should be used in the variable declaration area of a function:
- * \code
- * ...
- * {
- *   GET_CURRENT_CONTEXT(ctx);
- *   ...
- * \endcode
- */
 # ifdef THREADS
 #  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
 # else
@@ -90,6 +101,11 @@ extern struct _glapi_table *_glapi_Dispatch;
 
 #endif /* defined (GLX_USE_TLS) */
 
+
+/**
+ ** GL API public functions
+ **/
+
 extern void
 _glapi_noop_enable_warnings(GLboolean enable);
 
@@ -132,17 +148,13 @@ extern GLuint
 _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
 _glapi_get_proc_offset(const char *funcName);