summaryrefslogtreecommitdiffstats
path: root/src/mapi/u_current.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2014-03-05 07:47:41 -0700
committerBrian Paul <[email protected]>2014-03-06 07:47:05 -0700
commit280e0657072459804896e4c05d45d1cf8bfc97c4 (patch)
tree085b23251631a3f20bad0f6c6769eb18824b0d95 /src/mapi/u_current.h
parentef8a19ed4facf9769e1da1cbb9e741df23893ed5 (diff)
glapi: replace 'user' with 'context' in u_current.[ch] code
To make the functions more understandable. Reviewed-by: Chia-I Wu <[email protected]>
Diffstat (limited to 'src/mapi/u_current.h')
-rw-r--r--src/mapi/u_current.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mapi/u_current.h b/src/mapi/u_current.h
index f9cffd8c3d0..6709af28932 100644
--- a/src/mapi/u_current.h
+++ b/src/mapi/u_current.h
@@ -11,14 +11,14 @@
#ifdef GLX_USE_TLS
#define u_current_table _glapi_tls_Dispatch
-#define u_current_user _glapi_tls_Context
+#define u_current_context _glapi_tls_Context
#else
#define u_current_table _glapi_Dispatch
-#define u_current_user _glapi_Context
+#define u_current_context _glapi_Context
#endif
#define u_current_get_internal _glapi_get_dispatch
-#define u_current_get_user_internal _glapi_get_context
+#define u_current_get_context_internal _glapi_get_context
#define u_current_table_tsd _gl_DispatchTSD
@@ -33,13 +33,13 @@ struct mapi_table;
extern __thread struct mapi_table *u_current_table
__attribute__((tls_model("initial-exec")));
-extern __thread void *u_current_user
+extern __thread void *u_current_context
__attribute__((tls_model("initial-exec")));
#else /* GLX_USE_TLS */
extern struct mapi_table *u_current_table;
-extern void *u_current_user;
+extern void *u_current_context;
#endif /* GLX_USE_TLS */
@@ -58,10 +58,10 @@ struct mapi_table *
u_current_get_internal(void);
void
-u_current_set_user(const void *ptr);
+u_current_set_context(const void *ptr);
void *
-u_current_get_user_internal(void);
+u_current_get_context_internal(void);
static INLINE const struct mapi_table *
u_current_get(void)
@@ -75,12 +75,12 @@ u_current_get(void)
}
static INLINE const void *
-u_current_get_user(void)
+u_current_get_context(void)
{
#ifdef GLX_USE_TLS
- return u_current_user;
+ return u_current_context;
#else
- return likely(u_current_user) ? u_current_user : u_current_get_user_internal();
+ return likely(u_current_context) ? u_current_context : u_current_get_context_internal();
#endif
}