Qt and Node build issues

maplibre · Jan 9, 2025 · bada477 · bada477
1 parent a4d5ede
commit bada477
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/include/mbgl/mtl/uniform_buffer.hpp b/include/mbgl/mtl/uniform_buffer.hpp
@@ -43,7 +43,7 @@ class UniformBufferArray final : public gfx::UniformBufferArray {
     }
 
     void bind(RenderPass& renderPass) const noexcept;
-    void unbind(RenderPass& renderPass) const noexcept {};
+    void unbind(RenderPass&) const noexcept {}
 
 private:
     gfx::UniqueUniformBuffer copy(const gfx::UniformBuffer& buffer) override {

diff --git a/platform/node/CMakeLists.txt b/platform/node/CMakeLists.txt
@@ -37,13 +37,15 @@ target_include_directories(
         ${PROJECT_SOURCE_DIR}/include
         ${PROJECT_SOURCE_DIR}/platform/default/include
         ${PROJECT_SOURCE_DIR}/src
+        ${PROJECT_SOURCE_DIR}/vendor/nontype_functional/include
     PRIVATE ${LIBUV_INCLUDE_DIRS}
 )
 
 target_link_libraries(
     mbgl-node-loop
     PUBLIC
         Mapbox::Base
+    INTERFACE mbgl-vendor-nontype_functional
 )
 
 target_sources(
@@ -68,6 +70,7 @@ target_link_libraries(
     mbgl-node
     INTERFACE mbgl-node-loop
     INTERFACE Mapbox::Map
+    INTERFACE mbgl-vendor-nontype_functional
 )
 
 # FIXME: Node bindings only run fully on Linux now because it requires libuv RunLoop (which is the default on Linux). Also, Sanitizer will

diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
@@ -1536,8 +1536,8 @@ NodeMap::~NodeMap() {
     }
 }
 
-std::unique_ptr<mbgl::AsyncRequest> NodeFileSource::request(const mbgl::Resource& resource,
-                                                            mbgl::FileSource::Callback callback_) {
+std::unique_ptr<mbgl::AsyncRequest> NodeFileSource::request(
+    const mbgl::Resource& resource, mbgl::FileSource::CopyableCallback<void(mbgl::Response)> callback_) {
     assert(nodeMap);
 
     Nan::HandleScope scope;

diff --git a/platform/node/src/node_map.hpp b/platform/node/src/node_map.hpp
@@ -103,7 +103,8 @@ struct NodeFileSource : public mbgl::FileSource {
     NodeFileSource(NodeMap* nodeMap_)
         : nodeMap(nodeMap_) {}
     ~NodeFileSource() override = default;
-    std::unique_ptr<mbgl::AsyncRequest> request(const mbgl::Resource&, mbgl::FileSource::Callback) final;
+    std::unique_ptr<mbgl::AsyncRequest> request(const mbgl::Resource&,
+                                                mbgl::FileSource::CopyableCallback<void(mbgl::Response)>) final;
     bool canRequest(const mbgl::Resource&) const override;
     void setResourceOptions(mbgl::ResourceOptions) override;
     mbgl::ResourceOptions getResourceOptions() override;

diff --git a/platform/node/src/node_request.cpp b/platform/node/src/node_request.cpp
@@ -7,7 +7,8 @@
 
 namespace node_mbgl {
 
-NodeRequest::NodeRequest(mbgl::FileSource::Callback callback_, NodeAsyncRequest* asyncRequest_)
+NodeRequest::NodeRequest(mbgl::FileSource::CopyableCallback<void(mbgl::Response)> callback_,
+                         NodeAsyncRequest* asyncRequest_)
     : callback(std::move(callback_)),
       asyncRequest(asyncRequest_) {
     asyncRequest->request = this;
@@ -42,7 +43,8 @@ void NodeRequest::Init(v8::Local<v8::Object> target) {
 
 void NodeRequest::New(const Nan::FunctionCallbackInfo<v8::Value>& info) {
     auto target = reinterpret_cast<NodeMap*>(info[0].As<v8::External>()->Value());
-    auto callback = reinterpret_cast<mbgl::FileSource::Callback*>(info[1].As<v8::External>()->Value());
+    auto callback = reinterpret_cast<mbgl::FileSource::CopyableCallback<void(mbgl::Response)>*>(
+        info[1].As<v8::External>()->Value());
     auto asyncRequest = reinterpret_cast<NodeAsyncRequest*>(info[2].As<v8::External>()->Value());
 
     auto request = new NodeRequest(*callback, asyncRequest);

diff --git a/platform/node/src/node_request.hpp b/platform/node/src/node_request.hpp
@@ -22,7 +22,7 @@ struct NodeAsyncRequest : public mbgl::AsyncRequest {
 
 class NodeRequest : public Nan::ObjectWrap {
 public:
-    NodeRequest(mbgl::FileSource::Callback, NodeAsyncRequest*);
+    NodeRequest(mbgl::FileSource::CopyableCallback<void(mbgl::Response)>, NodeAsyncRequest*);
     ~NodeRequest() override;
 
     static Nan::Persistent<v8::Function> constructor;
@@ -34,7 +34,7 @@ class NodeRequest : public Nan::ObjectWrap {
 
     void unrefRequest();
 
-    mbgl::FileSource::Callback callback;
+    mbgl::FileSource::CopyableCallback<void(mbgl::Response)> callback;
     NodeAsyncRequest* asyncRequest;
     Nan::AsyncResource* asyncResource = new Nan::AsyncResource("mbgl:execute");
 };

diff --git a/platform/qt/src/utils/scheduler.cpp b/platform/qt/src/utils/scheduler.cpp
@@ -13,7 +13,11 @@ Scheduler::~Scheduler() {
     MBGL_VERIFY_THREAD(tid);
 }
 
-void Scheduler::schedule(std::function<void()>&& function) {
+void Scheduler::schedule(Task&& function) {
+    this->Scheduler::schedule(mbgl::util::SimpleIdentity::Empty, std::move(function));
+}
+
+void Scheduler::schedule(mbgl::util::SimpleIdentity, Task&& function) {
     const std::lock_guard<std::mutex> lock(m_taskQueueMutex);
     m_taskQueue.push(std::move(function));
 

diff --git a/platform/qt/src/utils/scheduler.hpp b/platform/qt/src/utils/scheduler.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <mbgl/actor/scheduler.hpp>
+#include <mbgl/util/identity.hpp>
 #include <mbgl/util/util.hpp>
 
 #include <QObject>
@@ -20,7 +21,8 @@ class Scheduler : public QObject, public mbgl::Scheduler {
     ~Scheduler() override;
 
     // mbgl::Scheduler implementation.
-    void schedule(std::function<void()>&& function) final;
+    void schedule(Task&&) final;
+    void schedule(mbgl::util::SimpleIdentity, Task&&) final;
 
     void waitForEmpty(const mbgl::util::SimpleIdentity tag = mbgl::util::SimpleIdentity::Empty) override;