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/tests/ut_renderer/Renderer.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/tests/ut_renderer/Renderer.cpp')
| -rw-r--r-- | emulator/opengl/tests/ut_renderer/Renderer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/emulator/opengl/tests/ut_renderer/Renderer.cpp b/emulator/opengl/tests/ut_renderer/Renderer.cpp index 22afadb..1102014 100644 --- a/emulator/opengl/tests/ut_renderer/Renderer.cpp +++ b/emulator/opengl/tests/ut_renderer/Renderer.cpp @@ -56,7 +56,7 @@ Renderer::Renderer() int Renderer::createSurface(RenderingThread *thread, const ClientHandle & handle) { - android::Mutex::Autolock(this->m_mutex); + emugl::Mutex::AutoLock(this->m_mutex); assert(m_surfaces.find(handle) == m_surfaces.end()); if (handle.handle == 0) { @@ -75,7 +75,7 @@ int Renderer::createSurface(RenderingThread *thread, const ClientHandle & handle int Renderer::destroySurface(RenderingThread *thread, const ClientHandle &handle) { - android::Mutex::Autolock(this->m_mutex); + emugl::Mutex::AutoLock(this->m_mutex); SurfaceMap::iterator i = m_surfaces.find(handle); if (i == m_surfaces.end()) { @@ -90,7 +90,7 @@ int Renderer::destroySurface(RenderingThread *thread, const ClientHandle &handle int Renderer::createContext(RenderingThread *thread, const ClientHandle &handle, ClientHandle shareCtx, int version) { - android::Mutex::Autolock(this->m_mutex); + emugl::Mutex::AutoLock(this->m_mutex); assert(m_ctxs.find(handle) == m_ctxs.end()); RendererContext *shared = NULL; @@ -115,7 +115,7 @@ int Renderer::createContext(RenderingThread *thread, const ClientHandle &handle, int Renderer::destroyContext(RenderingThread *thread, const ClientHandle &handle) { - android::Mutex::Autolock(this->m_mutex); + emugl::Mutex::AutoLock(this->m_mutex); ContextMap::iterator i = m_ctxs.find(handle); if (i == m_ctxs.end()) { @@ -133,7 +133,7 @@ int Renderer::makeCurrent(RenderingThread *thread, const ClientHandle &readSurface, const ClientHandle & ctx) { - android::Mutex::Autolock(this->m_mutex); + emugl::Mutex::AutoLock(this->m_mutex); RendererContext *currentContext = thread->currentContext(); @@ -172,7 +172,7 @@ int Renderer::makeCurrent(RenderingThread *thread, int Renderer::swapBuffers(RenderingThread *thread, const ClientHandle &surface) { - android::Mutex::Autolock(this->m_mutex); + emugl::Mutex::AutoLock(this->m_mutex); SurfaceMap::iterator s = m_surfaces.find(surface); if (s == m_surfaces.end()) { |