Add Free-Threaded resource upload to Android OpenGL Backend

CMakeLists.txt

@@ -1081,6 +1081,8 @@ if(MLN_WITH_OPENGL)
         SRC_FILES
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/attribute.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/attribute.hpp
+            ${PROJECT_SOURCE_DIR}/src/mbgl/gl/buffer_resource.cpp
+            ${PROJECT_SOURCE_DIR}/src/mbgl/gl/buffer_resource.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/command_encoder.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/command_encoder.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/context.cpp
@@ -1109,6 +1111,8 @@ if(MLN_WITH_OPENGL)
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/renderer_backend.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/resource_pool.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/resource_pool.hpp
+            ${PROJECT_SOURCE_DIR}/src/mbgl/gl/resource_upload_thread_pool.cpp
+            ${PROJECT_SOURCE_DIR}/src/mbgl/gl/resource_upload_thread_pool.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/state.hpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture.cpp
             ${PROJECT_SOURCE_DIR}/src/mbgl/gl/texture.hpp

bazel/core.bzl

@@ -866,6 +866,8 @@ MLN_CORE_HEADERS = [
 MLN_OPENGL_SOURCE = [
     "src/mbgl/gl/attribute.cpp",
     "src/mbgl/gl/attribute.hpp",
+    "src/mbgl/gl/buffer_resource.cpp",
+    "src/mbgl/gl/buffer_resource.hpp",
     "src/mbgl/gl/command_encoder.cpp",
     "src/mbgl/gl/command_encoder.hpp",
     "src/mbgl/gl/context.cpp",
@@ -894,6 +896,8 @@ MLN_OPENGL_SOURCE = [
     "src/mbgl/gl/renderer_backend.cpp",
     "src/mbgl/gl/resource_pool.cpp",
     "src/mbgl/gl/resource_pool.hpp",
+    "src/mbgl/gl/resource_upload_thread_pool.cpp",
+    "src/mbgl/gl/resource_upload_thread_pool.hpp",
     "src/mbgl/gl/state.hpp",
     "src/mbgl/gl/texture.cpp",
     "src/mbgl/gl/texture.hpp",

include/mbgl/gl/drawable_gl.hpp

@@ -46,7 +46,7 @@ class DrawableGL : public gfx::Drawable {
 
     void setVertexAttrId(const size_t id);
 
-    void upload(gfx::UploadPass&);
+    void issueUpload(gfx::UploadPass&);
 
     void updateVertexAttributes(gfx::VertexAttributeArrayPtr,
                                 std::size_t vertexCount,

include/mbgl/gl/layer_group_gl.hpp

@@ -17,7 +17,7 @@ class TileLayerGroupGL : public TileLayerGroup {
     TileLayerGroupGL(int32_t layerIndex, std::size_t initialCapacity, std::string name);
     ~TileLayerGroupGL() override {}
 
-    void upload(gfx::UploadPass&) override;
+    void issueUpload(gfx::UploadPass&) override;
     void render(RenderOrchestrator&, PaintParameters&) override;
 
     const gfx::UniformBufferArray& getUniformBuffers() const override { return uniformBuffers; };
@@ -39,7 +39,7 @@ class LayerGroupGL : public LayerGroup {
     LayerGroupGL(int32_t layerIndex, std::size_t initialCapacity, std::string name);
     ~LayerGroupGL() override {}
 
-    void upload(gfx::UploadPass&) override;
+    void issueUpload(gfx::UploadPass&) override;
     void render(RenderOrchestrator&, PaintParameters&) override;
 
     const gfx::UniformBufferArray& getUniformBuffers() const override { return uniformBuffers; };

include/mbgl/gl/renderer_backend.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <mbgl/gfx/renderer_backend.hpp>
+#include <mbgl/gl/resource_upload_thread_pool.hpp>
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/size.hpp>
 #include <mbgl/util/util.hpp>
@@ -14,6 +15,16 @@ namespace gl {
 using ProcAddress = void (*)();
 using FramebufferID = uint32_t;
 
+class UploadThreadContext {
+public:
+    UploadThreadContext() = default;
+    virtual ~UploadThreadContext() = default;
+    virtual void createContext() = 0;
+    virtual void destroyContext() = 0;
+    virtual void bindContext() = 0;
+    virtual void unbindContext() = 0;
+};
+
 class RendererBackend : public gfx::RendererBackend {
 public:
     RendererBackend(gfx::ContextMode);
@@ -28,6 +39,11 @@ class RendererBackend : public gfx::RendererBackend {
     void initShaders(gfx::ShaderRegistry&, const ProgramParameters& programParameters) override;
 #endif
 
+    virtual bool supportFreeThreadedUpload() const { return false; }
+    virtual void initFreeThreadedUpload() {}
+    virtual std::shared_ptr<UploadThreadContext> createUploadThreadContext() { return nullptr; }
+    gl::ResourceUploadThreadPool& getResourceUploadThreadPool();
+
 protected:
     std::unique_ptr<gfx::Context> createContext() override;
 
@@ -52,12 +68,17 @@ class RendererBackend : public gfx::RendererBackend {
     /// Returns true when assumed framebuffer binding hasn't changed from the implicit binding.
     bool implicitFramebufferBound();
 
+    void destroyResourceUploadThreadPool() { resourceUploadThreadPool = nullptr; }
+
 public:
     /// Triggers an OpenGL state update if the internal assumed state doesn't
     /// match the supplied values.
     void setFramebufferBinding(FramebufferID fbo);
     void setViewport(int32_t x, int32_t y, const Size&);
     void setScissorTest(bool);
+
+private:
+    std::unique_ptr<gl::ResourceUploadThreadPool> resourceUploadThreadPool;
 };
 
 } // namespace gl

include/mbgl/mtl/layer_group.hpp

@@ -19,7 +19,7 @@ class LayerGroup : public mbgl::LayerGroup {
     LayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name);
     ~LayerGroup() override {}
 
-    void upload(gfx::UploadPass&) override;
+    void issueUpload(gfx::UploadPass&) override;
     void render(RenderOrchestrator&, PaintParameters&) override;
 
     const gfx::UniformBufferArray& getUniformBuffers() const override { return uniformBuffers; };

include/mbgl/mtl/tile_layer_group.hpp

@@ -24,7 +24,7 @@ class TileLayerGroup : public mbgl::TileLayerGroup {
     TileLayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name);
     ~TileLayerGroup() override {}
 
-    void upload(gfx::UploadPass&) override;
+    void issueUpload(gfx::UploadPass&) override;
     void render(RenderOrchestrator&, PaintParameters&) override;
 
     const gfx::UniformBufferArray& getUniformBuffers() const override { return uniformBuffers; };

include/mbgl/renderer/layer_group.hpp

@@ -89,7 +89,7 @@ class LayerGroupBase : public util::SimpleIdentifiable {
     /// Called before starting each frame
     virtual void preRender(RenderOrchestrator&, PaintParameters&) {}
     /// Called during the upload pass
-    virtual void upload(gfx::UploadPass&) {}
+    virtual void issueUpload(gfx::UploadPass&) {}
     /// Called during each render pass
     virtual void render(RenderOrchestrator&, PaintParameters&) {}
     /// Called at the end of each frame

include/mbgl/renderer/render_target.hpp

@@ -63,7 +63,7 @@ class RenderTarget {
     }
 
     /// Upload the layer groups
-    void upload(gfx::UploadPass& uploadPass);
+    void issueUpload(gfx::UploadPass& uploadPass);
 
     /// Render the layer groups
     void render(RenderOrchestrator&, const RenderTree&, PaintParameters&);

include/mbgl/util/string.hpp

@@ -92,6 +92,11 @@ inline float stof(const std::string &str) {
     return std::stof(str);
 }
 
+// returns true if str contains substr
+inline bool contains(const std::string &str, const std::string &substr) {
+    return str.find(substr) != std::string::npos;
+}
+
 } // namespace util
 } // namespace mbgl
 

include/mbgl/vulkan/layer_group.hpp

@@ -19,7 +19,7 @@ class LayerGroup : public mbgl::LayerGroup {
     LayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name);
     ~LayerGroup() override {}
 
-    void upload(gfx::UploadPass&) override;
+    void issueUpload(gfx::UploadPass&) override;
     void render(RenderOrchestrator&, PaintParameters&) override;
 
     const gfx::UniformBufferArray& getUniformBuffers() const override { return uniformBuffers; };

include/mbgl/vulkan/tile_layer_group.hpp

@@ -21,7 +21,7 @@ class TileLayerGroup : public mbgl::TileLayerGroup {
     TileLayerGroup(int32_t layerIndex, std::size_t initialCapacity, std::string name);
     ~TileLayerGroup() override {}
 
-    void upload(gfx::UploadPass&) override;
+    void issueUpload(gfx::UploadPass&) override;
     void render(RenderOrchestrator&, PaintParameters&) override;
 
     const gfx::UniformBufferArray& getUniformBuffers() const override { return uniformBuffers; };