From a28d5d15ce43c2bf8f5e48a7bf4b66fefc7656e0 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Fri, 1 Aug 2025 13:01:16 +0200 Subject: [PATCH] [drape] Fixed signed/unsigned comparison warning by changing Resize interface to uint32_t Signed-off-by: Alexander Borsuk --- iphone/Maps/Classes/MetalContextFactory.mm | 14 +++++++------- iphone/Maps/Classes/iosOGLContext.h | 2 +- iphone/Maps/Classes/iosOGLContext.mm | 4 ++-- libs/drape/graphics_context.hpp | 2 +- libs/drape/metal/metal_base_context.hpp | 2 +- libs/drape/metal/metal_base_context.mm | 4 ++-- libs/drape/vulkan/vulkan_base_context.cpp | 10 +++++----- libs/drape/vulkan/vulkan_base_context.hpp | 2 +- libs/drape/vulkan/vulkan_context_factory.cpp | 2 +- qt/qt_common/qtoglcontext.cpp | 12 +++++------- qt/qt_common/qtoglcontext.hpp | 2 +- 11 files changed, 27 insertions(+), 29 deletions(-) diff --git a/iphone/Maps/Classes/MetalContextFactory.mm b/iphone/Maps/Classes/MetalContextFactory.mm index 6fc5d7fd9..619430ffa 100644 --- a/iphone/Maps/Classes/MetalContextFactory.mm +++ b/iphone/Maps/Classes/MetalContextFactory.mm @@ -11,34 +11,34 @@ public: : dp::metal::MetalBaseContext(metalLayer.device, screenSize, [this]{ return [m_metalLayer nextDrawable]; }) , m_metalLayer(metalLayer) {} - - void Resize(int w, int h) override + + void Resize(uint32_t w, uint32_t h) override { m_metalLayer.drawableSize = CGSize{static_cast(w), static_cast(h)}; ResetFrameDrawable(); dp::metal::MetalBaseContext::Resize(w, h); } - + private: CAMetalLayer * m_metalLayer; }; - + class UploadMetalContext : public dp::metal::MetalBaseContext { public: explicit UploadMetalContext(id device) : dp::metal::MetalBaseContext(device, {}, nullptr) {} - + void Present() override {} void MakeCurrent() override {} - void Resize(int w, int h) override {} + void Resize(uint32_t w, uint32_t h) override {} void SetFramebuffer(ref_ptr framebuffer) override {} void Init(dp::ApiVersion apiVersion) override { CHECK_EQUAL(apiVersion, dp::ApiVersion::Metal, ()); } - + void SetClearColor(dp::Color const & color) override {} void Clear(uint32_t clearBits, uint32_t storeBits) override {} void Flush() override {} diff --git a/iphone/Maps/Classes/iosOGLContext.h b/iphone/Maps/Classes/iosOGLContext.h index 553d946ab..68b4e1bbb 100644 --- a/iphone/Maps/Classes/iosOGLContext.h +++ b/iphone/Maps/Classes/iosOGLContext.h @@ -18,7 +18,7 @@ public: void MakeCurrent() override; void Present() override; void SetFramebuffer(ref_ptr framebuffer) override; - void Resize(int w, int h) override; + void Resize(uint32_t w, uint32_t h) override; void SetPresentAvailable(bool available) override; private: diff --git a/iphone/Maps/Classes/iosOGLContext.mm b/iphone/Maps/Classes/iosOGLContext.mm index 04b86cb0d..5ef0ad2de 100644 --- a/iphone/Maps/Classes/iosOGLContext.mm +++ b/iphone/Maps/Classes/iosOGLContext.mm @@ -81,7 +81,7 @@ void iosOGLContext::SetFramebuffer(ref_ptr framebuffer) } } -void iosOGLContext::Resize(int w, int h) +void iosOGLContext::Resize(uint32_t w, uint32_t h) { if (m_needBuffers && m_hasBuffers) { @@ -89,7 +89,7 @@ void iosOGLContext::Resize(int w, int h) GLint height = 0; glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &width); glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &height); - if (width == w && height == h) + if (width == static_cast(w) && height == static_cast(h)) return; DestroyBuffers(); diff --git a/libs/drape/graphics_context.hpp b/libs/drape/graphics_context.hpp index 2165a3e57..a5ac6ba7c 100644 --- a/libs/drape/graphics_context.hpp +++ b/libs/drape/graphics_context.hpp @@ -61,7 +61,7 @@ public: virtual void ForgetFramebuffer(ref_ptr framebuffer) = 0; virtual void ApplyFramebuffer(std::string const & framebufferLabel) = 0; // w, h - pixel size of render target (logical size * visual scale). - virtual void Resize(int /* w */, int /* h */) {} + virtual void Resize(uint32_t /* w */, uint32_t /* h */) {} virtual void SetRenderingEnabled(bool /* enabled */) {} virtual void SetPresentAvailable(bool /* available */) {} virtual bool Validate() { return true; } diff --git a/libs/drape/metal/metal_base_context.hpp b/libs/drape/metal/metal_base_context.hpp index 3f023b3b0..be1183a55 100644 --- a/libs/drape/metal/metal_base_context.hpp +++ b/libs/drape/metal/metal_base_context.hpp @@ -31,7 +31,7 @@ public: void MakeCurrent() override {} void DoneCurrent() override {} bool Validate() override { return true; } - void Resize(int w, int h) override; + void Resize(uint32_t w, uint32_t h) override; void SetFramebuffer(ref_ptr framebuffer) override; void ForgetFramebuffer(ref_ptr framebuffer) override {} void ApplyFramebuffer(std::string const & framebufferLabel) override; diff --git a/libs/drape/metal/metal_base_context.mm b/libs/drape/metal/metal_base_context.mm index 32bca956f..a15cf1bf0 100644 --- a/libs/drape/metal/metal_base_context.mm +++ b/libs/drape/metal/metal_base_context.mm @@ -130,12 +130,12 @@ void MetalBaseContext::PopDebugLabel() [m_currentCommandEncoder popDebugGroup]; } -void MetalBaseContext::Resize(int w, int h) +void MetalBaseContext::Resize(uint32_t w, uint32_t h) { if (m_depthTexture && m_depthTexture->GetWidth() == w && m_depthTexture->GetHeight() == h) return; - RecreateDepthTexture(m2::PointU(w, h)); + RecreateDepthTexture({w, h}); } void MetalBaseContext::SetFramebuffer(ref_ptr framebuffer) diff --git a/libs/drape/vulkan/vulkan_base_context.cpp b/libs/drape/vulkan/vulkan_base_context.cpp index b40780b86..30c25564e 100644 --- a/libs/drape/vulkan/vulkan_base_context.cpp +++ b/libs/drape/vulkan/vulkan_base_context.cpp @@ -142,15 +142,15 @@ void VulkanBaseContext::SetRenderingQueue(VkQueue queue) m_queue = queue; } -void VulkanBaseContext::Resize(int w, int h) +void VulkanBaseContext::Resize(uint32_t w, uint32_t h) { - if (m_swapchain != VK_NULL_HANDLE && m_surfaceCapabilities.currentExtent.width == static_cast(w) && - m_surfaceCapabilities.currentExtent.height == static_cast(h)) + if (m_swapchain != VK_NULL_HANDLE && m_surfaceCapabilities.currentExtent.width == w && + m_surfaceCapabilities.currentExtent.height == h) { return; } - m_surfaceCapabilities.currentExtent.width = static_cast(w); - m_surfaceCapabilities.currentExtent.height = static_cast(h); + m_surfaceCapabilities.currentExtent.width = w; + m_surfaceCapabilities.currentExtent.height = h; RecreateSwapchainAndDependencies(); } diff --git a/libs/drape/vulkan/vulkan_base_context.hpp b/libs/drape/vulkan/vulkan_base_context.hpp index 783037026..1aa732c93 100644 --- a/libs/drape/vulkan/vulkan_base_context.hpp +++ b/libs/drape/vulkan/vulkan_base_context.hpp @@ -40,7 +40,7 @@ public: void CollectMemory() override; void DoneCurrent() override {} bool Validate() override { return true; } - void Resize(int w, int h) override; + void Resize(uint32_t w, uint32_t h) override; void SetFramebuffer(ref_ptr framebuffer) override; void ForgetFramebuffer(ref_ptr framebuffer) override; void ApplyFramebuffer(std::string const & framebufferLabel) override; diff --git a/libs/drape/vulkan/vulkan_context_factory.cpp b/libs/drape/vulkan/vulkan_context_factory.cpp index af55e1a13..36d9e4f24 100644 --- a/libs/drape/vulkan/vulkan_context_factory.cpp +++ b/libs/drape/vulkan/vulkan_context_factory.cpp @@ -50,7 +50,7 @@ public: void Present() override {} - void Resize(int w, int h) override {} + void Resize(uint32_t w, uint32_t h) override {} void SetFramebuffer(ref_ptr framebuffer) override {} void Init(dp::ApiVersion apiVersion) override { CHECK_EQUAL(apiVersion, dp::ApiVersion::Vulkan, ()); } diff --git a/qt/qt_common/qtoglcontext.cpp b/qt/qt_common/qtoglcontext.cpp index d56d9ab6d..f651725c3 100644 --- a/qt/qt_common/qtoglcontext.cpp +++ b/qt/qt_common/qtoglcontext.cpp @@ -53,17 +53,15 @@ void QtRenderOGLContext::SetFramebuffer(ref_ptr framebuffer m_backFrame->bind(); } -void QtRenderOGLContext::Resize(int w, int h) +void QtRenderOGLContext::Resize(uint32_t w, uint32_t h) { CHECK(m_isContextAvailable, ()); - CHECK_GREATER_OR_EQUAL(w, 0, ()); - CHECK_GREATER_OR_EQUAL(h, 0, ()); // This function can't be called inside BeginRendering - EndRendering. - std::lock_guard lock(m_frameMutex); + std::lock_guard lock(m_frameMutex); - auto const nw = static_cast(math::NextPowOf2(static_cast(w))); - auto const nh = static_cast(math::NextPowOf2(static_cast(h))); + auto const nw = static_cast(math::NextPowOf2(w)); + auto const nh = static_cast(math::NextPowOf2(h)); if (nw <= m_width && nh <= m_height && m_backFrame != nullptr) { @@ -86,7 +84,7 @@ bool QtRenderOGLContext::AcquireFrame() if (!m_isContextAvailable) return false; - std::lock_guard lock(m_frameMutex); + std::lock_guard lock(m_frameMutex); // Render current acquired frame. if (!m_frameUpdated) return true; diff --git a/qt/qt_common/qtoglcontext.hpp b/qt/qt_common/qtoglcontext.hpp index 7249180a3..2431b68eb 100644 --- a/qt/qt_common/qtoglcontext.hpp +++ b/qt/qt_common/qtoglcontext.hpp @@ -24,7 +24,7 @@ public: void MakeCurrent() override; void DoneCurrent() override; void SetFramebuffer(ref_ptr framebuffer) override; - void Resize(int w, int h) override; + void Resize(uint32_t w, uint32_t h) override; bool AcquireFrame(); GLuint GetTextureHandle() const;