diff options
| author | Jason Sams <rjsams@android.com> | 2009-10-29 02:03:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 02:03:37 -0700 |
| commit | 060746b3831fcc31eede09e55240143d413460e5 (patch) | |
| tree | 00bc93a3d4f42fd7a146ba7775c2d92a35be3d2e /libs/rs/rsContext.h | |
| parent | 0a9416482c3fa0c55af242277cc695c6e1268b61 (diff) | |
| parent | 3c249da7eaceaffae87657aeb7179ffc4a5e1570 (diff) | |
| download | frameworks_base-060746b3831fcc31eede09e55240143d413460e5.zip frameworks_base-060746b3831fcc31eede09e55240143d413460e5.tar.gz frameworks_base-060746b3831fcc31eede09e55240143d413460e5.tar.bz2 | |
am 3c249da7: am 21e799ed: am e9e50b57: Merge change I7136220b into eclair
Merge commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570'
* commit '3c249da7eaceaffae87657aeb7179ffc4a5e1570':
Fix egl cleanup code on context teardown.
Diffstat (limited to 'libs/rs/rsContext.h')
| -rw-r--r-- | libs/rs/rsContext.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/rs/rsContext.h b/libs/rs/rsContext.h index dcdd65a..a919983 100644 --- a/libs/rs/rsContext.h +++ b/libs/rs/rsContext.h @@ -54,6 +54,7 @@ public: static pthread_key_t gThreadTLSKey; static uint32_t gThreadTLSKeyCount; + static uint32_t gGLContextCount; static pthread_mutex_t gInitMutex; struct ScriptTLSStruct { @@ -214,6 +215,7 @@ private: Context(); void initEGL(); + void deinitEGL(); bool runRootScript(); |