diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-03-10 15:16:30 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-03-11 10:24:51 +0100 |
| commit | aac93f1585bc9bdf8a57b6ed3c47c24f56a3990a (patch) | |
| tree | 27409568ac69f1efca05cbe75bc10883088db5c2 /emulator/opengl/host/libs/Translator/EGL/EglGlobalInfo.h | |
| parent | fd8752eb6a438832e0ba9a19db896614403f8945 (diff) | |
| download | sdk-aac93f1585bc9bdf8a57b6ed3c47c24f56a3990a.zip sdk-aac93f1585bc9bdf8a57b6ed3c47c24f56a3990a.tar.gz sdk-aac93f1585bc9bdf8a57b6ed3c47c24f56a3990a.tar.bz2 | |
emulator/opengl: Remove android::Mutex.
This patch removes the dependency on android::Mutex from
<cutils/threads.h> by providing a custom implementation, which
is a simple wrapper around pthread_mutex_t / CriticalSection,
under shared/emugl/common/mutex.h
+ Provide unit tests.
Change-Id: I379ef0c480c478ab9ba5f2faaf8274267eff37ba
Diffstat (limited to 'emulator/opengl/host/libs/Translator/EGL/EglGlobalInfo.h')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/EGL/EglGlobalInfo.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/emulator/opengl/host/libs/Translator/EGL/EglGlobalInfo.h b/emulator/opengl/host/libs/Translator/EGL/EglGlobalInfo.h index ec07ffe..f56b79e 100644 --- a/emulator/opengl/host/libs/Translator/EGL/EglGlobalInfo.h +++ b/emulator/opengl/host/libs/Translator/EGL/EglGlobalInfo.h @@ -16,14 +16,15 @@ #ifndef EGL_GLOBAL_INFO #define EGL_GLOBAL_INFO -#include <list> -#include <EGL/egl.h> -#include <utils/threads.h> -#include <GLcommon/TranslatorIfaces.h> #include "EglDisplay.h" #include "EglConfig.h" #include "EglContext.h" +#include <GLcommon/TranslatorIfaces.h> +#include "emugl/common/mutex.h" +#include <list> +#include <EGL/egl.h> + typedef std::map<EglDisplay*,EGLNativeDisplayType>DisplaysMap; @@ -58,7 +59,7 @@ private: EGLNativeInternalDisplayType m_default; GLESiface* m_gles_ifaces[MAX_GLES_VERSION]; bool m_gles_extFuncs_inited[MAX_GLES_VERSION]; - android::Mutex m_lock; + emugl::Mutex m_lock; }; #endif |