From 5daf631b5d6e8c9f1e4b85755c3cdbd65051dcfb Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Thu, 29 Sep 2016 11:12:12 +0200 Subject: [PATCH] Use host GLES driver conditionally --- src/anbox/graphics/gl_renderer_server.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/anbox/graphics/gl_renderer_server.cpp b/src/anbox/graphics/gl_renderer_server.cpp index 7a2be465..b14857cf 100644 --- a/src/anbox/graphics/gl_renderer_server.cpp +++ b/src/anbox/graphics/gl_renderer_server.cpp @@ -30,16 +30,16 @@ namespace graphics { GLRendererServer::GLRendererServer(const std::shared_ptr &window_creator) : window_creator_(window_creator) { -#if 0 - // Force the host EGL/GLES libraries as translator implementation - ::setenv("ANDROID_EGL_LIB", "libEGL.so.1", 0); - ::setenv("ANDROID_GLESv1_LIB", "libGLESv2.so.2", 0); - ::setenv("ANDROID_GLESv2_LIB", "libGLESv2.so.2", 0); -#else - ::setenv("ANDROID_EGL_LIB", utils::string_format("%s/libEGL_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); - ::setenv("ANDROID_GLESv1_LIB", utils::string_format("%s/libGLES_CM_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); - ::setenv("ANDROID_GLESv2_LIB", utils::string_format("%s/libGLES_V2_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); -#endif + if (utils::is_env_set("USE_HOST_GLES")) { + // Force the host EGL/GLES libraries as translator implementation + ::setenv("ANDROID_EGL_LIB", "libEGL.so.1", 0); + ::setenv("ANDROID_GLESv1_LIB", "libGLESv2.so.2", 0); + ::setenv("ANDROID_GLESv2_LIB", "libGLESv2.so.2", 0); + } else { + ::setenv("ANDROID_EGL_LIB", utils::string_format("%s/libEGL_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); + ::setenv("ANDROID_GLESv1_LIB", utils::string_format("%s/libGLES_CM_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); + ::setenv("ANDROID_GLESv2_LIB", utils::string_format("%s/libGLES_V2_translator.so", TRANSLATOR_INSTALL_DIR).c_str(), 0); + } if (!initLibrary()) BOOST_THROW_EXCEPTION(std::runtime_error("Failed to initialize OpenGL renderer")); -- GitLab