From 154a7162baeac02c02f0338240ec9f4407a0916e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Mon, 20 Nov 2017 22:39:52 +0100 Subject: [build] allow WITH_EGL for macOS as well (SwiftShader) and enable EGL for GLFW --- CMakeLists.txt | 10 +++++++++- Makefile | 4 +++- platform/android/config.cmake | 2 +- platform/darwin/mbgl/gl/gl_impl.hpp | 12 +++++++++--- platform/glfw/glfw_view.cpp | 10 ++++++++-- platform/ios/config.cmake | 2 +- platform/macos/config.cmake | 20 +++++++++++++++++--- 7 files changed, 48 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f88252754..6b1ef6e2e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ if(WITH_OSMESA AND WITH_EGL) endif() if(WITH_EGL) - add_definitions(-DMBGL_USE_GLES2=1) + set(USE_GLES2 ON) endif() if($ENV{CI}) @@ -129,6 +129,14 @@ endif() include(platform/${MBGL_PLATFORM}/config.cmake) +if(WITH_EGL) + add_definitions(-DMBGL_WITH_EGL=1) +endif() + +if(USE_GLES2) + add_definitions(-DMBGL_USE_GLES2=1) +endif() + if (COMMAND mbgl_filesource) include(cmake/filesource.cmake) endif() diff --git a/Makefile b/Makefile index d54dcc4fd6..ca1ff3d74d 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,8 @@ MACOS_XCODEBUILD = xcodebuild \ $(MACOS_PROJ_PATH): $(BUILD_DEPS) $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings mkdir -p $(MACOS_OUTPUT_PATH) - (cd $(MACOS_OUTPUT_PATH) && cmake -G Xcode ../..) + (cd $(MACOS_OUTPUT_PATH) && cmake -G Xcode ../.. \ + -DWITH_EGL=${WITH_EGL}) $(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings: platform/macos/WorkspaceSettings.xcsettings mkdir -p "$(MACOS_USER_DATA_PATH)" @@ -167,6 +168,7 @@ $(MACOS_COMPDB_PATH)/Makefile: mkdir -p $(MACOS_COMPDB_PATH) (cd $(MACOS_COMPDB_PATH) && cmake ../../../.. \ -DCMAKE_BUILD_TYPE=$(BUILDTYPE) \ + -DWITH_EGL=${WITH_EGL} \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON) .PHONY: diff --git a/platform/android/config.cmake b/platform/android/config.cmake index b3888a9418..d64cd50758 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -1,4 +1,4 @@ -add_definitions(-DMBGL_USE_GLES2=1) +set(USE_GLES2 ON) include(cmake/test-files.cmake) diff --git a/platform/darwin/mbgl/gl/gl_impl.hpp b/platform/darwin/mbgl/gl/gl_impl.hpp index b4c062a474..0db125c7b4 100644 --- a/platform/darwin/mbgl/gl/gl_impl.hpp +++ b/platform/darwin/mbgl/gl/gl_impl.hpp @@ -8,9 +8,15 @@ #include #include #elif TARGET_OS_MAC - #include - #include - #include + #if MBGL_USE_GLES2 + #define GL_GLEXT_PROTOTYPES + #include + #include + #else + #include + #include + #include + #endif #else #error Unsupported Apple platform #endif diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index d591f897e0..064aff6346 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -53,13 +53,19 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_) height = videoMode->height; } +#if __APPLE__ glfwWindowHint(GLFW_COCOA_GRAPHICS_SWITCHING, GL_TRUE); +#endif + +#if MBGL_WITH_EGL + glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API); +#endif #ifdef DEBUG glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GL_TRUE); #endif -#ifdef GL_ES_VERSION_2_0 +#if MBGL_USE_GLES2 glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); @@ -633,7 +639,7 @@ void GLFWView::toggle3DExtrusions(bool visible) { namespace mbgl { namespace platform { -#ifndef GL_ES_VERSION_2_0 +#ifndef MBGL_USE_GLES2 void showDebugImage(std::string name, const char *data, size_t width, size_t height) { glfwInit(); diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index c3db194988..78d5d5a0a9 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -1,4 +1,4 @@ -add_definitions(-DMBGL_USE_GLES2=1) +set(USE_GLES2 ON) mason_use(icu VERSION 58.1-min-size) diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 2716f7c84d..e2f53a8576 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -31,9 +31,7 @@ macro(mbgl_platform_core) PRIVATE platform/default/mbgl/gl/headless_frontend.hpp PRIVATE platform/default/mbgl/gl/headless_backend.cpp PRIVATE platform/default/mbgl/gl/headless_backend.hpp - PRIVATE platform/darwin/src/headless_backend_cgl.cpp PRIVATE platform/default/mbgl/gl/headless_display.hpp - PRIVATE platform/darwin/src/headless_display_cgl.cpp # Snapshotting PRIVATE platform/default/mbgl/map/map_snapshotter.cpp @@ -46,6 +44,23 @@ macro(mbgl_platform_core) PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) + if(WITH_EGL) + target_sources(mbgl-core + PRIVATE platform/linux/src/headless_backend_egl.cpp + PRIVATE platform/linux/src/headless_display_egl.cpp + ) + mason_use(swiftshader VERSION 2017-11-20) + target_add_mason_package(mbgl-core PUBLIC swiftshader) + else() + target_sources(mbgl-core + PRIVATE platform/darwin/src/headless_backend_cgl.cpp + PRIVATE platform/darwin/src/headless_display_cgl.cpp + ) + target_link_libraries(mbgl-core + PUBLIC "-framework OpenGL" + ) + endif() + target_add_mason_package(mbgl-core PUBLIC geojson) target_add_mason_package(mbgl-core PUBLIC polylabel) target_add_mason_package(mbgl-core PRIVATE icu) @@ -64,7 +79,6 @@ macro(mbgl_platform_core) PUBLIC "-lz" PUBLIC "-framework Foundation" PUBLIC "-framework CoreGraphics" - PUBLIC "-framework OpenGL" PUBLIC "-framework ImageIO" PUBLIC "-framework CoreServices" PUBLIC "-framework SystemConfiguration" -- cgit v1.2.1