From 8b6ced19fe30c651851d4df5296d17f16a6fcb61 Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Tue, 15 May 2018 08:32:31 +0200
Subject: [PATCH] graphics: specify all necessary OpenGL ES libraries by
 default

---
 src/anbox/cmds/system_info.cpp            | 2 +-
 src/anbox/graphics/emugl/RenderApi.cpp    | 4 ++--
 src/anbox/graphics/emugl/RenderApi.h      | 2 +-
 src/anbox/graphics/gl_renderer_server.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/anbox/cmds/system_info.cpp b/src/anbox/cmds/system_info.cpp
index 83848c7..60d77eb 100644
--- a/src/anbox/cmds/system_info.cpp
+++ b/src/anbox/cmds/system_info.cpp
@@ -129,7 +129,7 @@ class SystemInformation {
   }
 
   void collect_graphics_info() {
-    auto gl_libs = anbox::graphics::emugl::default_gl_libraries(true);
+    auto gl_libs = anbox::graphics::emugl::default_gl_libraries();
     if (!anbox::graphics::emugl::initialize(gl_libs, nullptr, nullptr)) {
       return;
     }
diff --git a/src/anbox/graphics/emugl/RenderApi.cpp b/src/anbox/graphics/emugl/RenderApi.cpp
index 69fce23..cad1bf7 100644
--- a/src/anbox/graphics/emugl/RenderApi.cpp
+++ b/src/anbox/graphics/emugl/RenderApi.cpp
@@ -37,13 +37,13 @@ constexpr const char *default_glesv2_lib{"libGLESv2.so.2"};
 namespace anbox {
 namespace graphics {
 namespace emugl {
-std::vector<GLLibrary> default_gl_libraries(bool no_glesv1) {
+std::vector<GLLibrary> default_gl_libraries() {
   return std::vector<GLLibrary>{
     {GLLibrary::Type::EGL, default_egl_lib},
     // If environment doesn't provide a GLESv1 .so file we use the GLESv2
     // implementation instead. If our stack allows it we can try to get
     // rid of GLESv1 completely at a later point.
-    {GLLibrary::Type::GLESv1, no_glesv1 ? default_glesv2_lib : default_glesv1_lib},
+    {GLLibrary::Type::GLESv1, default_glesv1_lib},
     {GLLibrary::Type::GLESv2, default_glesv2_lib},
   };
 }
diff --git a/src/anbox/graphics/emugl/RenderApi.h b/src/anbox/graphics/emugl/RenderApi.h
index 150fdd6..ae90b05 100644
--- a/src/anbox/graphics/emugl/RenderApi.h
+++ b/src/anbox/graphics/emugl/RenderApi.h
@@ -37,7 +37,7 @@ struct GLLibrary {
   boost::filesystem::path path;
 };
 
-std::vector<GLLibrary> default_gl_libraries(bool no_glesv1 = false);
+std::vector<GLLibrary> default_gl_libraries();
 
 bool initialize(const std::vector<GLLibrary> &libs, emugl_logger_struct *log_funcs, logger_t crash_func);
 }  // namespace emugl
diff --git a/src/anbox/graphics/gl_renderer_server.cpp b/src/anbox/graphics/gl_renderer_server.cpp
index 958acd3..c0570fa 100644
--- a/src/anbox/graphics/gl_renderer_server.cpp
+++ b/src/anbox/graphics/gl_renderer_server.cpp
@@ -76,7 +76,7 @@ GLRendererServer::GLRendererServer(const Config &config, const std::shared_ptr<w
 
   composer_ = std::make_shared<LayerComposer>(renderer_, composer_strategy);
 
-  auto gl_libs = emugl::default_gl_libraries(true);
+  auto gl_libs = emugl::default_gl_libraries();
 
   emugl_logger_struct log_funcs;
   log_funcs.coarse = logger_write;