Update to upstream OpenGL 2 branch of MapLibre Native

maplibre · Dec 21, 2023 · 667d0e2 · 667d0e2
1 parent c582526
commit 667d0e2
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 249 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -50,9 +50,6 @@ target_sources(
         map_observer.cpp map_observer_p.hpp
         map_renderer.cpp map_renderer_p.hpp
         map.cpp map_p.hpp
-        renderer_backend.cpp renderer_backend_p.hpp
-        renderer_observer_p.hpp
-        scheduler.cpp scheduler_p.hpp
         settings.cpp settings_p.hpp
         types.cpp
         utils.cpp
@@ -101,6 +98,7 @@ target_include_directories(
         ${CMAKE_CURRENT_SOURCE_DIR}/style
         ${CMAKE_CURRENT_BINARY_DIR}/include
         ${MLN_CORE_PATH}/src
+        ${MLN_CORE_PATH}/platform/qt/src
 )
 
 # Common link libraries
@@ -112,7 +110,6 @@ target_link_libraries(
         Qt${QT_VERSION_MAJOR}::Network
     PRIVATE
         $<BUILD_INTERFACE:mbgl-compiler-options>
-        $<BUILD_INTERFACE:mbgl-core-interface>
         $<BUILD_INTERFACE:mbgl-core>
         $<BUILD_INTERFACE:CompilerOptions>
 )
@@ -123,6 +120,13 @@ if(NOT MLN_QT_WITH_INTERNAL_SQLITE)
             Qt${QT_VERSION_MAJOR}::Sql
     )
 endif()
+foreach(target ${MLN_QT_VENDOR_LIBRARIES})
+    target_link_libraries(
+        Core
+            PRIVATE
+                $<BUILD_INTERFACE:${target}>
+    )
+endforeach()
 
 # Apple specifics
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

diff --git a/src/core/map.cpp b/src/core/map.cpp
@@ -9,7 +9,8 @@
 #include "conversion_p.hpp"
 #include "geojson_p.hpp"
 #include "map_observer_p.hpp"
-#include "renderer_observer_p.hpp"
+
+#include "utils/renderer_observer.hpp"
 
 #include <mbgl/actor/scheduler.hpp>
 #include <mbgl/annotation/annotation.hpp>

diff --git a/src/core/map_renderer.cpp b/src/core/map_renderer.cpp
@@ -5,7 +5,7 @@
 
 #include "map_renderer_p.hpp"
 
-#include "scheduler_p.hpp"
+#include "utils/scheduler.hpp"
 
 #include <mbgl/gfx/backend_scope.hpp>
 

diff --git a/src/core/map_renderer_p.hpp b/src/core/map_renderer_p.hpp
@@ -5,9 +5,10 @@
 
 #pragma once
 
-#include "renderer_backend_p.hpp"
 #include "settings.hpp"
 
+#include "utils/renderer_backend.hpp"
+
 #include <mbgl/renderer/renderer.hpp>
 #include <mbgl/renderer/renderer_observer.hpp>
 #include <mbgl/util/util.hpp>

diff --git a/src/core/renderer_backend.cpp b/src/core/renderer_backend.cpp
diff --git a/src/core/renderer_backend_p.hpp b/src/core/renderer_backend_p.hpp
diff --git a/src/core/renderer_observer_p.hpp b/src/core/renderer_observer_p.hpp
diff --git a/src/core/scheduler.cpp b/src/core/scheduler.cpp
diff --git a/src/core/scheduler_p.hpp b/src/core/scheduler_p.hpp
diff --git a/vendor/maplibre-native b/vendor/maplibre-native
+40 −46		.github/workflows/qt-ci.yml
+1 −0		.gitignore
+2 −8		platform/qt/CHANGELOG.md
+5 −39		platform/qt/README.md
+18 −14		platform/qt/qt.cmake
+56 −0		platform/qt/src/utils/renderer_backend.cpp
+38 −0		platform/qt/src/utils/renderer_backend.hpp
+44 −0		platform/qt/src/utils/renderer_observer.hpp
+40 −0		platform/qt/src/utils/scheduler.cpp
+38 −0		platform/qt/src/utils/scheduler.hpp