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/libOpenglRender/FrameBuffer.h | |
| 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/libOpenglRender/FrameBuffer.h')
| -rw-r--r-- | emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h b/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h index de0b71c..5b03624 100644 --- a/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h +++ b/emulator/opengl/host/libs/libOpenglRender/FrameBuffer.h @@ -20,7 +20,8 @@ #include "ColorBuffer.h" #include "RenderContext.h" #include "WindowSurface.h" -#include <utils/threads.h> +#include "emugl/common/mutex.h" + #include <map> #include <EGL/egl.h> #include <stdint.h> @@ -111,7 +112,7 @@ private: int m_y; int m_width; int m_height; - android::Mutex m_lock; + emugl::Mutex m_lock; FBNativeWindowType m_nativeWindow; FrameBufferCaps m_caps; EGLDisplay m_eglDisplay; |