From a288b1ffad112a2696724fc24076caf19eeac904 Mon Sep 17 00:00:00 2001 From: mwilsnd <53413200+mwilsnd@users.noreply.github.com> Date: Tue, 11 Jul 2023 09:29:40 -0500 Subject: [PATCH] Drawable CI Fixes (#1319) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- CMakeLists.txt | 8 +++++--- include/mbgl/gl/renderable_resource.hpp | 2 -- platform/qt/src/map.cpp | 2 +- src/mbgl/renderer/layers/render_symbol_layer.cpp | 8 ++++---- src/mbgl/renderer/renderer_impl.cpp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4acdc480..9d01401f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,8 @@ option(MLN_WITH_OPENGL "Build with OpenGL renderer" ON) option(MLN_WITH_EGL "Build with EGL renderer" OFF) option(MLN_WITH_OSMESA "Build with OSMesa (Software) renderer" OFF) option(MLN_WITH_WERROR "Make all compilation warnings errors" ON) -option(MLN_LEGACY_RENDERER "Include the legacy rendering pathway" OFF) -option(MLN_DRAWABLE_RENDERER "Include the drawable rendering pathway" ON) +option(MLN_LEGACY_RENDERER "Include the legacy rendering pathway" ON) +option(MLN_DRAWABLE_RENDERER "Include the drawable rendering pathway" OFF) option(MLN_RENDERER_SPLIT_VIEW "Enable a split view if both renderers are enabled" ON) option(MLN_RENDERER_QUAD_SPLIT_VIEW "When using split view, split opaque and translucent passes as well" OFF) @@ -26,7 +26,7 @@ if (MLN_WITH_CLANG_TIDY) # TODO: there are options which are only available on GCC(e.g. -Werror=maybe-uninitialized), # that's why we need to disable this `unknown-warning-option` here. # We could check if current compiler supports particular flag before enabling it. - set(CLANG_TIDY_COMMAND "${CLANG_TIDY_COMMAND};--extra-arg=-Wno-error=unknown-warning-option;--extra-arg=-Wno-error=pragmas") + set(CLANG_TIDY_COMMAND "${CLANG_TIDY_COMMAND};--extra-arg=-Wno-unknown-warning-option;--extra-arg=-Wno-pragmas") endif() if (MLN_WITH_QT AND NOT CMAKE_OSX_DEPLOYMENT_TARGET) @@ -88,6 +88,8 @@ target_compile_options( $<$:-Wno-error=maybe-uninitialized> $<$:-Wno-error=return-type> $<$:-Wno-error=unknown-pragmas> + $<$:-Wno-error=pragmas> + $<$:-Wno-unknown-warning-option> $<$,$>>:-Wno-error=deprecated-declarations> $<$,$>>:-Wno-error=unused-parameter> $<$,$>>:-Wno-error=unused-property-ivar> diff --git a/include/mbgl/gl/renderable_resource.hpp b/include/mbgl/gl/renderable_resource.hpp index d07e062e9..edf0a2a40 100644 --- a/include/mbgl/gl/renderable_resource.hpp +++ b/include/mbgl/gl/renderable_resource.hpp @@ -12,8 +12,6 @@ protected: explicit RenderableResource() = default; public: - virtual void bind() = 0; - virtual void swap() { // Renderable resources that require a swap function to be called // explicitly can override this method. diff --git a/platform/qt/src/map.cpp b/platform/qt/src/map.cpp index 9d960fd34..d20146711 100644 --- a/platform/qt/src/map.cpp +++ b/platform/qt/src/map.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index b9ff0a7ed..0218549ac 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -408,7 +408,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters) { const auto draw = [¶meters, this](auto& programInstance, const auto& uniformValues, const auto& buffers, - auto& segments, + const auto& segments, const auto& symbolSizeBinder, const auto& binders, const auto& paintProperties, @@ -493,7 +493,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters) { draw, tile, *renderData, - std::ref(bucket.icon.segments), + std::cref(bucket.icon.segments), bucketPaintProperties, parameters, false /*sdfIcon*/ @@ -509,7 +509,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters) { draw, tile, *renderData, - std::ref(bucket.sdfIcon.segments), + std::cref(bucket.sdfIcon.segments), bucketPaintProperties, parameters, true /*sdfIcon*/ @@ -525,7 +525,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters) { draw, tile, *renderData, - std::ref(bucket.text.segments), + std::cref(bucket.text.segments), bucketPaintProperties, parameters); } diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index da805205b..1c6638c64 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -62,9 +62,9 @@ void Renderer::Impl::setObserver(RendererObserver* observer_) { observer = observer_ ? observer_ : &nullObserver(); } -void Renderer::Impl::preRender(const RenderTree& renderTree, +void Renderer::Impl::preRender([[maybe_unused]] const RenderTree& renderTree, [[maybe_unused]] const std::shared_ptr& updateParameters) { - auto& context = backend.getContext(); + [[maybe_unused]] auto& context = backend.getContext(); // Blocks execution until the renderable is available. backend.getDefaultRenderable().wait();