mapi: replace mapi_table abstraction

[mesa.git] / src / mapi / u_current.h

diff --git a/src/mapi/u_current.h b/src/mapi/u_current.h
index ea4f81723463cac1aae49f4fe691d73b2d45a3e6..3c9a414ee84d86d3062be9302677a1cd381eb3a7 100644 (file)
--- a/src/mapi/u_current.h
+++ b/src/mapi/u_current.h
@@ -10,9 +10,6 @@
 
 #include "glapi/glapi.h"
 
-/* ugly renames to match glapi.h */
-#define mapi_table _glapi_table
-
 #ifdef GLX_USE_TLS
 #define u_current_table _glapi_tls_Dispatch
 #define u_current_context _glapi_tls_Context
@@ -28,11 +25,11 @@
 
 #else /* MAPI_MODE_UTIL || MAPI_MODE_GLAPI || MAPI_MODE_BRIDGE */
 
-struct mapi_table;
+struct _glapi_table;
 
 #ifdef GLX_USE_TLS
 
-extern __thread struct mapi_table *u_current_table
+extern __thread struct _glapi_table *u_current_table
     __attribute__((tls_model("initial-exec")));
 
 extern __thread void *u_current_context
@@ -40,7 +37,7 @@ extern __thread void *u_current_context
 
 #else /* GLX_USE_TLS */
 
-extern struct mapi_table *u_current_table;
+extern struct _glapi_table *u_current_table;
 extern void *u_current_context;
 
 #endif /* GLX_USE_TLS */
@@ -54,9 +51,9 @@ void
 u_current_destroy(void);
 
 void
-u_current_set_table(const struct mapi_table *tbl);
+u_current_set_table(const struct _glapi_table *tbl);
 
-struct mapi_table *
+struct _glapi_table *
 u_current_get_table_internal(void);
 
 void
@@ -65,7 +62,7 @@ u_current_set_context(const void *ptr);
 void *
 u_current_get_context_internal(void);
 
-static inline const struct mapi_table *
+static inline const struct _glapi_table *
 u_current_get_table(void)
 {
 #ifdef GLX_USE_TLS