diff options
| author | David 'Digit' Turner <digit@google.com> | 2015-03-20 22:16:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:16:47 +0000 |
| commit | 654f070478a652eebbf6560f593e8e7c97388e80 (patch) | |
| tree | 842029b9ec6fc084ddf70997e603a7bd8e530a8c /emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp | |
| parent | 5b69bb42bbdd028daae30d1b1258914f9cb9fa59 (diff) | |
| parent | a268ba5f6bbbc67904124f7368f617dbb3fae6ef (diff) | |
| download | sdk-654f070478a652eebbf6560f593e8e7c97388e80.zip sdk-654f070478a652eebbf6560f593e8e7c97388e80.tar.gz sdk-654f070478a652eebbf6560f593e8e7c97388e80.tar.bz2 | |
am a268ba5f: am c245592b: Merge changes I551e0f3d,I26d84cf5,I27c993d1 into idea133 automerge: 4e42336
* commit 'a268ba5f6bbbc67904124f7368f617dbb3fae6ef':
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/Translator/GLcommon/GLDispatch.cpp')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp b/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp index 7b217fd..5da7247 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp +++ b/emulator/opengl/host/libs/Translator/GLcommon/GLDispatch.cpp @@ -16,7 +16,7 @@ #include <GLcommon/GLDispatch.h> #include <stdio.h> -#include <OpenglOsUtils/osDynLibrary.h> +#include "emugl/common/shared_library.h" #ifdef __linux__ #include <GL/glx.h> @@ -31,13 +31,13 @@ typedef void (*GL_FUNC_PTR)(); static GL_FUNC_PTR getGLFuncAddress(const char *funcName) { GL_FUNC_PTR ret = NULL; #ifdef __linux__ - static osUtils::dynLibrary* libGL = osUtils::dynLibrary::open("libGL.so"); + static emugl::SharedLibrary* libGL = emugl::SharedLibrary::open("libGL"); ret = (GL_FUNC_PTR)glXGetProcAddress((const GLubyte*)funcName); #elif defined(WIN32) - static osUtils::dynLibrary* libGL = osUtils::dynLibrary::open("opengl32"); + static emugl::SharedLibrary* libGL = emugl::SharedLibrary::open("opengl32"); ret = (GL_FUNC_PTR)wglGetProcAddress(funcName); #elif defined(__APPLE__) - static osUtils::dynLibrary* libGL = osUtils::dynLibrary::open("/System/Library/Frameworks/OpenGL.framework/OpenGL"); + static emugl::SharedLibrary* libGL = emugl::SharedLibrary::open("/System/Library/Frameworks/OpenGL.framework/OpenGL"); #endif if(!ret && libGL){ ret = libGL->findSymbol(funcName); |