Merge branch 'master' into dockerfile

Author: morphis

CMakeLists.txt

@@ -76,6 +76,11 @@ if (${LXC_VERSION} VERSION_LESS 3.0)
   message(STATUS "Building with LXC 2.x compatibility support")
 endif()
 
+option(ENABLE_X11 "Enable X11 support" ON)
+if (ENABLE_X11)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DX11_SUPPORT")
+endif()
+
 option(ENABLE_WAYLAND "Enable wayland support" ON)
 if (ENABLE_WAYLAND)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWAYLAND_SUPPORT")
@@ -87,7 +92,7 @@ if (ENABLE_MIR)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMIR_SUPPORT")
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMESA_EGL_NO_X11_HEADERS")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEGL_NO_X11")
 
 if((Protobuf_VERSION GREATER "3.7") OR (Protobuf_VERSION EQUAL "3.7"))
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_PROTOBUF_CALLBACK_HEADER")

external/android-emugl/host/libs/libOpenGLESDispatch/gles_common.entries

@@ -17,7 +17,6 @@ void glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usa
 void glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
 void glClear(GLbitfield mask);
 void glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-void glClearDepth(GLclampd depth);
 void glClearStencil(GLint s);
 void glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
 void glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
@@ -29,7 +28,6 @@ void glDeleteBuffers(GLsizei n, const GLuint *buffers);
 void glDeleteTextures(GLsizei n, const GLuint *textures);
 void glDepthFunc(GLenum func);
 void glDepthMask(GLboolean flag);
-void glDepthRange(GLclampd zNear, GLclampd zFar);
 void glDisable(GLenum cap);
 void glDrawArrays(GLenum mode, GLint first, GLsizei count);
 void glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
@@ -68,7 +66,3 @@ void glTexParameteri(GLenum target, GLenum pname, GLint param);
 void glTexParameteriv(GLenum target, GLenum pname, const GLint *params);
 void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
 void glViewport(GLint x, GLint y, GLsizei width, GLsizei height);
-void glPushAttrib( GLbitfield mask );
-void glPushClientAttrib( GLbitfield mask );
-void glPopAttrib( void );
-void glPopClientAttrib( void );

src/anbox/graphics/emugl/Renderer.cpp

@@ -126,8 +126,8 @@ bool Renderer::initialize(EGLNativeDisplayType nativeDisplay) {
                                  EGL_NONE};
 
   int n;
-  if (!s_egl.eglChooseConfig(m_eglDisplay, configAttribs, &m_eglConfig,
-                             1, &n)) {
+  if ((s_egl.eglChooseConfig(m_eglDisplay, configAttribs, &m_eglConfig,
+                             1, &n) == EGL_FALSE) || n == 0) {
     ERROR("Failed to select EGL configuration");
     return false;
   }

src/anbox/logger.cpp

@@ -17,7 +17,9 @@
 
 #include <thread>
 
+#ifndef BOOST_LOG_DYN_LINK
 #define BOOST_LOG_DYN_LINK
+#endif
 #include <boost/date_time.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/log/expressions.hpp>

src/anbox/platform/sdl/window.cpp

@@ -80,13 +80,15 @@ Window::Window(const std::shared_ptr<Renderer> &renderer,
   SDL_VERSION(&info.version);
   SDL_GetWindowWMInfo(window_, &info);
   switch (info.subsystem) {
+#if defined(X11_SUPPORT)
     case SDL_SYSWM_X11:
       native_display_ = static_cast<EGLNativeDisplayType>(info.info.x11.display);
       native_window_ = static_cast<EGLNativeWindowType>(info.info.x11.window);
       break;
+#endif
 #if defined(WAYLAND_SUPPORT)
     case SDL_SYSWM_WAYLAND:
-      native_display_ = static_cast<EGLNativeDisplayType>(info.info.wl.display);
+      native_display_ = reinterpret_cast<EGLNativeDisplayType>(info.info.wl.display);
       native_window_ = reinterpret_cast<EGLNativeWindowType>(info.info.wl.surface);
       break;
 #endif