From aac93f1585bc9bdf8a57b6ed3c47c24f56a3990a Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 10 Mar 2014 15:16:30 +0100 Subject: emulator/opengl: Remove android::Mutex. This patch removes the dependency on android::Mutex from 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 --- emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp') diff --git a/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp b/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp index 6572719..46f039c 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp +++ b/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp @@ -23,6 +23,7 @@ #include #include #include +#include //decleration static void convertFixedDirectLoop(const char* dataIn,unsigned int strideIn,void* dataOut,unsigned int nBytes,unsigned int strideOut,int attribSize); @@ -84,7 +85,7 @@ void GLESConversionArrays::operator++(){ } GLDispatch GLEScontext::s_glDispatch; -android::Mutex GLEScontext::s_lock; +emugl::Mutex GLEScontext::s_lock; std::string* GLEScontext::s_glExtensions= NULL; std::string GLEScontext::s_glVendor; std::string GLEScontext::s_glRenderer; -- cgit v1.1