diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-07-21 16:32:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-21 16:32:32 +0000 |
| commit | a268ba5f6bbbc67904124f7368f617dbb3fae6ef (patch) | |
| tree | 889f16f76567054ea5fc085f274ceade0a09bd81 /emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp | |
| parent | 4af45028b6b9761038a83a445d6d21137e8be2ef (diff) | |
| parent | c245592b0d472437ade15a22076c2193441f0eea (diff) | |
| download | sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.zip sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.tar.gz sdk-a268ba5f6bbbc67904124f7368f617dbb3fae6ef.tar.bz2 | |
am c245592b: Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133 automerge: 4e42336
* commit 'c245592b0d472437ade15a22076c2193441f0eea':
emulator/opengl: Remove out-of-process handling code.
emulator/opengl: refactor Thread class.
emulator/opengl: refactor shared library handling.
Diffstat (limited to 'emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp')
| -rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp b/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp index 19d6c1f..3dcfdb5 100644 --- a/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp +++ b/emulator/opengl/host/libs/libOpenglRender/RenderThread.cpp @@ -26,7 +26,7 @@ #define STREAM_BUFFER_SIZE 4*1024*1024 RenderThread::RenderThread(IOStream *stream, emugl::Mutex *lock) : - osUtils::Thread(), + emugl::Thread(), m_lock(lock), m_stream(stream), m_finished(false) @@ -43,7 +43,7 @@ RenderThread *RenderThread::create(IOStream *p_stream, emugl::Mutex *lock) return new RenderThread(p_stream, lock); } -int RenderThread::Main() +intptr_t RenderThread::main() { RenderThreadInfo tInfo; |