diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-16 17:26:55 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-16 17:26:55 -0400 |
| commit | 69fba87ac16d1c10da81fc3213ae169c755797f4 (patch) | |
| tree | d00b6ca9fe85e6db27169e303a6231ecc8afdc1a /opengl/libs/GLES2/gl2.cpp | |
| parent | 7bb7e99216956d917af1786a3e02a92cac46fc84 (diff) | |
| parent | 6fc569971faa342b2e2da46c55fbfbba3a2a7814 (diff) | |
| download | frameworks_base-69fba87ac16d1c10da81fc3213ae169c755797f4.zip frameworks_base-69fba87ac16d1c10da81fc3213ae169c755797f4.tar.gz frameworks_base-69fba87ac16d1c10da81fc3213ae169c755797f4.tar.bz2 | |
Merge change I6fc56997 into eclair
* changes:
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 |