From 5a9946733b57957ac4e8091cf323b229aae56dd7 Mon Sep 17 00:00:00 2001
From: Tim Sylvester <tim@wetdogweather.com>
Date: Fri, 30 Jun 2023 21:47:00 +0000
Subject: [PATCH] Drawable Renderer (#1570), fix build issues

---
 CMakeLists.txt                        | 1 +
 bazel/core.bzl                        | 1 +
 include/mbgl/gfx/vertex_attribute.hpp | 3 +--
 render-test/runner.cpp                | 2 +-
 src/mbgl/gfx/vertex_attribute.cpp     | 4 ----
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9eb4b39d8..3a3bbb6bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -905,6 +905,7 @@ list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/dtoa.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/dtoa.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/event.cpp
+    ${PROJECT_SOURCE_DIR}/src/mbgl/util/filesystem.hpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/font_stack.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/geo.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/geojson_impl.cpp
diff --git a/bazel/core.bzl b/bazel/core.bzl
index a1b38d1d6..52dfa662d 100644
--- a/bazel/core.bzl
+++ b/bazel/core.bzl
@@ -493,6 +493,7 @@ MLN_CORE_SOURCE = [
     "src/mbgl/util/dtoa.cpp",
     "src/mbgl/util/dtoa.hpp",
     "src/mbgl/util/event.cpp",
+    "src/mbgl/util/filesystem.hpp",
     "src/mbgl/util/font_stack.cpp",
     "src/mbgl/util/geo.cpp",
     "src/mbgl/util/geojson_impl.cpp",
diff --git a/include/mbgl/gfx/vertex_attribute.hpp b/include/mbgl/gfx/vertex_attribute.hpp
index ae749bd67..714d1f12b 100644
--- a/include/mbgl/gfx/vertex_attribute.hpp
+++ b/include/mbgl/gfx/vertex_attribute.hpp
@@ -145,8 +145,7 @@ public:
 
     VertexAttributeArray(int initCapacity = 10);
     VertexAttributeArray(VertexAttributeArray&&);
-    // Would need to use the virtual assignment operator
-    VertexAttributeArray(const VertexAttributeArray&);
+    VertexAttributeArray(const VertexAttributeArray&) = delete; // Would need to use the virtual assignment operator
     virtual ~VertexAttributeArray() = default;
 
     /// Number of elements
diff --git a/render-test/runner.cpp b/render-test/runner.cpp
index 0e9e23304..efbda79f7 100644
--- a/render-test/runner.cpp
+++ b/render-test/runner.cpp
@@ -689,7 +689,7 @@ TestRunner::Impl::Impl(const TestMetadata& metadata,
       fileSource(mbgl::FileSourceManager::get()->getFileSource(
           mbgl::FileSourceType::ResourceLoader, resourceOptions, clientOptions)),
       map(frontend,
-          *observer.get(),
+          *observer,
           mbgl::MapOptions()
               .withMapMode(metadata.mapMode)
               .withSize(metadata.size)
diff --git a/src/mbgl/gfx/vertex_attribute.cpp b/src/mbgl/gfx/vertex_attribute.cpp
index 367ae6979..f20b2c1e4 100644
--- a/src/mbgl/gfx/vertex_attribute.cpp
+++ b/src/mbgl/gfx/vertex_attribute.cpp
@@ -12,10 +12,6 @@ std::unique_ptr<VertexAttribute> VertexAttributeArray::nullref = nullptr;
 VertexAttributeArray::VertexAttributeArray(int initCapacity)
     : attrs(initCapacity) {}
 
-VertexAttributeArray::VertexAttributeArray(const VertexAttributeArray& other) {
-    operator=(other);
-}
-
 VertexAttributeArray::VertexAttributeArray(VertexAttributeArray&& other)
     : attrs(std::move(other.attrs)) {}