diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-14 02:06:37 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-10-14 02:06:37 -0700 |
| commit | 6fc569971faa342b2e2da46c55fbfbba3a2a7814 (patch) | |
| tree | 56b790ce3ac8aa81b4481f7b6a4e9384aee7c84e /opengl/libs/GLES2/gl2.cpp | |
| parent | b10e2f1a861933f50d9ad8ea24b5dfa5643a2c11 (diff) | |
| download | frameworks_base-6fc569971faa342b2e2da46c55fbfbba3a2a7814.zip frameworks_base-6fc569971faa342b2e2da46c55fbfbba3a2a7814.tar.gz frameworks_base-6fc569971faa342b2e2da46c55fbfbba3a2a7814.tar.bz2 | |
fix [2187212] add support for GLESv2 dispatch based on TLS
Instead of using a different function pointer table for ES 1.x and ES 2.x,
we use a single one that is the union (sort|uniq) of both tables. Two
instances of this table are initialized with pointers to GL ES 1.x and GL ES 2.x
entry-points.
When a context is created, we store its version number and when it is bound to a
thread we set the approruiate table based on the stored version.
This introduce no penalty while dispatching gl calls to the right API version.
[Pending Dr No approval for MR1]
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 |