diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-16 15:02:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-16 15:02:41 -0700 |
| commit | 01c723443404ff2be71da1613bf87a4ca28e2a27 (patch) | |
| tree | 552ab9dd48a4a269af39b07edb37d64c35067e15 /opengl/libs/GLES2/gl2.cpp | |
| parent | de9b467a1ede0c9c729aa599fdbb713f8ef95e2f (diff) | |
| parent | 1ed0e43dac155db048ccc9152dc9425506099957 (diff) | |
| download | frameworks_base-01c723443404ff2be71da1613bf87a4ca28e2a27.zip frameworks_base-01c723443404ff2be71da1613bf87a4ca28e2a27.tar.gz frameworks_base-01c723443404ff2be71da1613bf87a4ca28e2a27.tar.bz2 | |
am 1ed0e43d: am 93942a5b: am 69fba87a: Merge change I6fc56997 into eclair
Merge commit '1ed0e43dac155db048ccc9152dc9425506099957'
* commit '1ed0e43dac155db048ccc9152dc9425506099957':
fix [2187212] add support for GLESv2 dispatch based on TLS
Diffstat (limited to 'opengl/libs/GLES2/gl2.cpp')
| -rw-r--r-- | opengl/libs/GLES2/gl2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp index e5358c3..4c0ba88 100644 --- a/opengl/libs/GLES2/gl2.cpp +++ b/opengl/libs/GLES2/gl2.cpp @@ -53,7 +53,7 @@ using namespace android; "bx lr \n" \ : \ : [tls] "J"(TLS_SLOT_OPENGL_API*4), \ - [api] "J"(__builtin_offsetof(gl_hooks_t, gl2._api)) \ + [api] "J"(__builtin_offsetof(gl_hooks_t, gl._api)) \ : \ ); @@ -66,11 +66,11 @@ using namespace android; #define API_ENTRY(_api) _api #define CALL_GL_API(_api, ...) \ - gl_hooks_t::gl2_t const * const _c = &getGlThreadSpecific()->gl2; \ + gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl; \ _c->_api(__VA_ARGS__) #define CALL_GL_API_RETURN(_api, ...) \ - gl_hooks_t::gl2_t const * const _c = &getGlThreadSpecific()->gl2; \ + gl_hooks_t::gl_t const * const _c = &getGlThreadSpecific()->gl; \ return _c->_api(__VA_ARGS__) #endif |