aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/opengl/host/libs/libOpenglRender/RenderThread.h
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2015-03-20 22:16:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 22:16:44 +0000
commit5b69bb42bbdd028daae30d1b1258914f9cb9fa59 (patch)
tree58c5be399992d1143cc0053fb47a0d316634ed7b /emulator/opengl/host/libs/libOpenglRender/RenderThread.h
parent02e53175bc968093136a8a6a14c7ab33e3ced03f (diff)
parent4af45028b6b9761038a83a445d6d21137e8be2ef (diff)
downloadsdk-5b69bb42bbdd028daae30d1b1258914f9cb9fa59.zip
sdk-5b69bb42bbdd028daae30d1b1258914f9cb9fa59.tar.gz
sdk-5b69bb42bbdd028daae30d1b1258914f9cb9fa59.tar.bz2
am 4af45028: am 245fae13: Merge "emulator/opengl: Add global lock to libOpenglRender." into idea133 automerge: d1dd8ee
* commit '4af45028b6b9761038a83a445d6d21137e8be2ef': emulator/opengl: Add global lock to libOpenglRender. Move SdkVersionInfo from sdk-common to sdklib, part 3.
Diffstat (limited to 'emulator/opengl/host/libs/libOpenglRender/RenderThread.h')
-rw-r--r--emulator/opengl/host/libs/libOpenglRender/RenderThread.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/RenderThread.h b/emulator/opengl/host/libs/libOpenglRender/RenderThread.h
index 80a9aef..e94d782 100644
--- a/emulator/opengl/host/libs/libOpenglRender/RenderThread.h
+++ b/emulator/opengl/host/libs/libOpenglRender/RenderThread.h
@@ -19,20 +19,23 @@
#include "IOStream.h"
#include "GLDecoder.h"
#include "renderControl_dec.h"
+
+#include "emugl/common/mutex.h"
#include "osThread.h"
class RenderThread : public osUtils::Thread
{
public:
- static RenderThread *create(IOStream *p_stream);
+ static RenderThread* create(IOStream* p_stream, emugl::Mutex* mutex);
virtual ~RenderThread();
bool isFinished() const { return m_finished; }
private:
- RenderThread();
+ RenderThread(IOStream* p_stream, emugl::Mutex* mutex);
virtual int Main();
private:
+ emugl::Mutex *m_lock;
IOStream *m_stream;
renderControl_decoder_context_t m_rcDec;
bool m_finished;