diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-03-11 19:56:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-11 19:56:54 +0000 |
| commit | d0e3afebe9cb67ec7fc86c9c5b83291f445d1622 (patch) | |
| tree | eb785a57aa751e2a67415f75022f356c7b3d5006 /emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp | |
| parent | e988e0593918f2d493ced9b6cf5c57c9f9686358 (diff) | |
| parent | aac93f1585bc9bdf8a57b6ed3c47c24f56a3990a (diff) | |
| download | sdk-d0e3afebe9cb67ec7fc86c9c5b83291f445d1622.zip sdk-d0e3afebe9cb67ec7fc86c9c5b83291f445d1622.tar.gz sdk-d0e3afebe9cb67ec7fc86c9c5b83291f445d1622.tar.bz2 | |
Merge "emulator/opengl: Remove android::Mutex." into idea133
Diffstat (limited to 'emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 <GLcommon/TextureUtils.h> #include <GLcommon/FramebufferData.h> #include <strings.h> +#include <string.h> //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; |