R1/2/3/4/5xx: fixed calculation of cliprects in CopyBuffer.

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

diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index e3ef066e6993b8e1fe33f942f762f1c2f9252a19..ddfb1cffb915b7493076eb86575a80cbd37947c6 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:  6.5
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -46,26 +46,55 @@
 
 
 #include "GL/gl.h"
+#include "glapitable.h"
+#include "glthread.h"
 
-struct _glapi_table;
 
 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
 
 
+/**
+ ** 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 __thread void * _glapi_tls_Context
+    __attribute__((tls_model("initial-exec")));
+
+# 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);
 
@@ -108,23 +137,19 @@ 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);
 
 
-extern const _glapi_proc
+extern _glapi_proc
 _glapi_get_proc_address(const char *funcName);