diff options
| author | Michael Lentine <mlentine@google.com> | 2015-01-28 22:38:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 22:38:42 +0000 |
| commit | 2f1e3b4d219d1ad3fe66cc9abb4ed61be9906ed1 (patch) | |
| tree | 94092f3a92ff741bc7fdf101b85d84ae9965d140 /opengl/libs/EGL/egl_display.h | |
| parent | e55073a96ca7e9447592988614664b3c9666d93a (diff) | |
| parent | d6fce7ab66e5d33e3ee16247485d1b8c26dd7ee8 (diff) | |
| download | frameworks_native-2f1e3b4d219d1ad3fe66cc9abb4ed61be9906ed1.zip frameworks_native-2f1e3b4d219d1ad3fe66cc9abb4ed61be9906ed1.tar.gz frameworks_native-2f1e3b4d219d1ad3fe66cc9abb4ed61be9906ed1.tar.bz2 | |
am d6fce7ab: Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
* commit 'd6fce7ab66e5d33e3ee16247485d1b8c26dd7ee8':
Remove lock around ref count check in terminate.
Diffstat (limited to 'opengl/libs/EGL/egl_display.h')
| -rw-r--r-- | opengl/libs/EGL/egl_display.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/opengl/libs/EGL/egl_display.h b/opengl/libs/EGL/egl_display.h index 0a6e425..2d86295 100644 --- a/opengl/libs/EGL/egl_display.h +++ b/opengl/libs/EGL/egl_display.h @@ -131,7 +131,9 @@ private: void leave() { return mHibernation.decWakeCount(HibernationMachine::WEAK); } uint32_t refs; - mutable Mutex lock; + bool eglIsInitialized; + mutable Mutex lock, refLock; + mutable Condition refCond; SortedVector<egl_object_t*> objects; String8 mVendorString; String8 mVersionString; |