projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glthread: don't declare unmarshal functions as inline
[mesa.git]
/
src
/
mapi
/
u_current.h
diff --git
a/src/mapi/u_current.h
b/src/mapi/u_current.h
index f9cffd8c3d0c1bcd67bf2969186fdfc01fefdd80..9a79f0bf93acec2cd985fac262cfe7a24f5c0471 100644
(file)
--- a/
src/mapi/u_current.h
+++ b/
src/mapi/u_current.h
@@
-1,47
+1,46
@@
#ifndef _U_CURRENT_H_
#define _U_CURRENT_H_
#ifndef _U_CURRENT_H_
#define _U_CURRENT_H_
+#include "c99_compat.h"
+#include "util/macros.h"
+
+
#if defined(MAPI_MODE_UTIL) || defined(MAPI_MODE_GLAPI) || \
defined(MAPI_MODE_BRIDGE)
#include "glapi/glapi.h"
#if defined(MAPI_MODE_UTIL) || defined(MAPI_MODE_GLAPI) || \
defined(MAPI_MODE_BRIDGE)
#include "glapi/glapi.h"
-/* ugly renames to match glapi.h */
-#define mapi_table _glapi_table
-
-#ifdef GLX_USE_TLS
+#ifdef USE_ELF_TLS
#define u_current_table _glapi_tls_Dispatch
#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
#else
#define u_current_table _glapi_Dispatch
-#define u_current_
user
_glapi_Context
+#define u_current_
context
_glapi_Context
#endif
#endif
-#define u_current_get_internal _glapi_get_dispatch
-#define u_current_get_
user
_internal _glapi_get_context
+#define u_current_get_
table_
internal _glapi_get_dispatch
+#define u_current_get_
context
_internal _glapi_get_context
#define u_current_table_tsd _gl_DispatchTSD
#else /* MAPI_MODE_UTIL || MAPI_MODE_GLAPI || MAPI_MODE_BRIDGE */
#define u_current_table_tsd _gl_DispatchTSD
#else /* MAPI_MODE_UTIL || MAPI_MODE_GLAPI || MAPI_MODE_BRIDGE */
-#include "u_compiler.h"
-
-struct mapi_table;
+struct _glapi_table;
-#ifdef
GLX_USE
_TLS
+#ifdef
USE_ELF
_TLS
-extern __thread struct
m
api_table *u_current_table
+extern __thread struct
_gl
api_table *u_current_table
__attribute__((tls_model("initial-exec")));
__attribute__((tls_model("initial-exec")));
-extern __thread void *u_current_
user
+extern __thread void *u_current_
context
__attribute__((tls_model("initial-exec")));
__attribute__((tls_model("initial-exec")));
-#else /*
GLX_USE
_TLS */
+#else /*
USE_ELF
_TLS */
-extern struct
m
api_table *u_current_table;
-extern void *u_current_
user
;
+extern struct
_gl
api_table *u_current_table;
+extern void *u_current_
context
;
-#endif /*
GLX_USE
_TLS */
+#endif /*
USE_ELF
_TLS */
#endif /* MAPI_MODE_UTIL || MAPI_MODE_GLAPI || MAPI_MODE_BRIDGE */
#endif /* MAPI_MODE_UTIL || MAPI_MODE_GLAPI || MAPI_MODE_BRIDGE */
@@
-52,35
+51,35
@@
void
u_current_destroy(void);
void
u_current_destroy(void);
void
-u_current_set
(const struct m
api_table *tbl);
+u_current_set
_table(const struct _gl
api_table *tbl);
-struct
m
api_table *
-u_current_get_internal(void);
+struct
_gl
api_table *
+u_current_get_
table_
internal(void);
void
void
-u_current_set_
user
(const void *ptr);
+u_current_set_
context
(const void *ptr);
void *
void *
-u_current_get_
user
_internal(void);
+u_current_get_
context
_internal(void);
-static
INLINE const struct m
api_table *
-u_current_get(void)
+static
inline const struct _gl
api_table *
+u_current_get
_table
(void)
{
{
-#ifdef
GLX_USE
_TLS
+#ifdef
USE_ELF
_TLS
return u_current_table;
#else
return (likely(u_current_table) ?
return u_current_table;
#else
return (likely(u_current_table) ?
- u_current_table : u_current_get_internal());
+ u_current_table : u_current_get_
table_
internal());
#endif
}
#endif
}
-static
INLINE
const void *
-u_current_get_
user
(void)
+static
inline
const void *
+u_current_get_
context
(void)
{
{
-#ifdef
GLX_USE
_TLS
- return u_current_
user
;
+#ifdef
USE_ELF
_TLS
+ return u_current_
context
;
#else
#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
}
#endif
}