Chromium Code Reviews| Index: ui/gl/gl_bindings.h |
| diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h |
| index a09cd7141caf594aea35b7355f39d004ecad88a7..2405b8126192912659c90a8970f8aa055d3d1de4 100644 |
| --- a/ui/gl/gl_bindings.h |
| +++ b/ui/gl/gl_bindings.h |
| @@ -15,7 +15,9 @@ |
| #include <EGL/egl.h> |
| #include <EGL/eglext.h> |
| +#include "base/lazy_instance.h" |
| #include "base/logging.h" |
| +#include "base/threading/thread_local.h" |
| #include "build/build_config.h" |
| #include "ui/gl/gl_export.h" |
| @@ -285,7 +287,9 @@ struct GL_EXPORT DriverGLX { |
| }; |
| #endif |
| -GL_EXPORT extern GLApi* g_current_gl_context; |
| +#define g_current_gl_context g_current_gl_context_tls.Pointer()->Get() |
|
no sievers
2013/06/12 23:34:59
I did this hack for the autogenerated code.
|
| +GL_EXPORT extern base::LazyInstance<base::ThreadLocalPointer<GLApi> > |
| + g_current_gl_context_tls; |
| GL_EXPORT extern OSMESAApi* g_current_osmesa_context; |
| GL_EXPORT extern DriverGL g_driver_gl; |
| GL_EXPORT extern DriverOSMESA g_driver_osmesa; |