diff options
| author | Emil Velikov <[email protected]> | 2017-04-13 18:23:50 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-04 18:17:03 +0100 |
| commit | 4562d88c1d6f02b0601abd97f421a72adf64b3a6 (patch) | |
| tree | 7132b6a381a2d9c98467fc6be8687208e76fcc4e /src/mapi/u_current.h | |
| parent | 424cb9d3eaf2cd4e049c728920a9965df1fbcfac (diff) | |
mapi: replace mapi_table abstraction
Replace all instances of mapi_table with the actual struct _glapi_table.
The former may have been needed when the OpenVG was around. But since
that one is long gone, there' no point in having the current confusing
mix of the two.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/mapi/u_current.h')
| -rw-r--r-- | src/mapi/u_current.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/mapi/u_current.h b/src/mapi/u_current.h index ea4f8172346..3c9a414ee84 100644 --- 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 |