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

diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index 5486819da53..8f2cf662183 100644
--- a/src/mesa/glapi/glapi.h
+++ b/src/mesa/glapi/glapi.h
@@ -1,10 +1,8 @@
-/* $Id: glapi.h,v 1.11 1999/12/17 14:51:29 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
+ * Version:  7.1
  *
- * Copyright (C) 1999  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"),
@@ -25,30 +23,105 @@
  */
 
 
+/**
+ * \mainpage Mesa GL API Module
+ *
+ * \section GLAPIIntroduction Introduction
+ *
+ * The Mesa GL API module is responsible for dispatching all the
+ * gl*() functions.  All GL functions are dispatched by jumping through
+ * the current dispatch table (basically a struct full of function
+ * pointers.)
+ *
+ * A per-thread current dispatch table and per-thread current context
+ * pointer are managed by this module too.
+ *
+ * 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, ...);
+
+
+#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;
+const extern struct _glapi_table *_glapi_Dispatch;
 
-extern GLboolean _glapi_ThreadSafe;
+extern __thread void * _glapi_tls_Context
+    __attribute__((tls_model("initial-exec")));
 
-extern void *_glapi_CurrentContext;
+# define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_tls_Context
 
+#else
+
+extern void *_glapi_Context;
+extern struct _glapi_table *_glapi_Dispatch;
+
+# ifdef THREADS
+#  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
+# else
+#  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);
+
+extern void
+_glapi_set_warning_func(_glapi_warning_func func);
 
 extern void
 _glapi_check_multithread(void);
 
 
 extern void
-_glapi_set_current_context(void *context);
+_glapi_set_context(void *context);
 
 
 extern void *
-_glapi_get_current_context(void);
+_glapi_get_context(void);
 
 
 extern void
@@ -59,27 +132,35 @@ extern struct _glapi_table *
 _glapi_get_dispatch(void);
 
 
-extern GLuint
-_glapi_get_dispatch_table_size(void);
+extern int
+_glapi_begin_dispatch_override(struct _glapi_table *override);
 
 
-extern const char *
-_glapi_get_version(void);
+extern void
+_glapi_end_dispatch_override(int layer);
+
+
+struct _glapi_table *
+_glapi_get_override_dispatch(int layer);
+
+
+extern GLuint
+_glapi_get_dispatch_table_size(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);
 
 
-extern const GLvoid *
+extern _glapi_proc
 _glapi_get_proc_address(const char *funcName);