summaryrefslogtreecommitdiff
path: root/src/mapi/mapi/entry_x86_tls.h
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-12-17 00:24:27 +0800
committerChia-I Wu <olv@lunarg.com>2011-01-20 17:15:50 +0800
commit97185bf2654f7e72d8bfcc216f905492655d4c77 (patch)
tree92a3f7e0ef7faa683270dd91df34390c0cc0b838 /src/mapi/mapi/entry_x86_tls.h
parent96c52d16c1716b8974b5421342f53f36cb80c10f (diff)
mapi: Add support for bridge mode.
In bridge mode, mapi no longer implements glapi.h. It becomes a user of glapi.h. Imagine an app that uses both libGL.so and libGLESv2.so. There will be two copies of glapi in the app's memory. It is possible that _glapi_get_dispatch does not return what _glapi_set_dispatch set, if they access different copies of the global variables. The solution to this situation to build either one of the libraries as a bridge to the other. Or build both libraries as bridges to another shared glapi library.
Diffstat (limited to 'src/mapi/mapi/entry_x86_tls.h')
-rw-r--r--src/mapi/mapi/entry_x86_tls.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mapi/mapi/entry_x86_tls.h b/src/mapi/mapi/entry_x86_tls.h
index 43f3489564..5169069a13 100644
--- a/src/mapi/mapi/entry_x86_tls.h
+++ b/src/mapi/mapi/entry_x86_tls.h
@@ -27,7 +27,6 @@
*/
#include <string.h>
-#include "u_execmem.h"
#include "u_macros.h"
#ifdef __linux__
@@ -80,6 +79,10 @@ __asm__(".balign 16\n"
__asm__(".text");
#endif /* GLX_X86_READONLY_TEXT */
+#ifndef MAPI_MODE_BRIDGE
+
+#include "u_execmem.h"
+
extern unsigned long
x86_current_tls();
@@ -139,3 +142,5 @@ entry_generate(int slot)
return entry;
}
+
+#endif /* MAPI_MODE_BRIDGE */