From dd5b8895fe983b0e577ddd222ecb902c7a9a4af1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 4 Aug 2019 22:45:25 -0400 Subject: [PATCH] VideoCommon/RenderBase: Make functions const where applicable --- Source/Core/VideoCommon/RenderBase.cpp | 10 +++++----- Source/Core/VideoCommon/RenderBase.h | 13 +++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 48b8e4cfd3..4bd69e186d 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -665,13 +665,13 @@ void Renderer::ScaleTexture(AbstractFramebuffer* dst_framebuffer, MathUtil::Rectangle Renderer::ConvertFramebufferRectangle(const MathUtil::Rectangle& rect, - const AbstractFramebuffer* framebuffer) + const AbstractFramebuffer* framebuffer) const { return ConvertFramebufferRectangle(rect, framebuffer->GetWidth(), framebuffer->GetHeight()); } MathUtil::Rectangle Renderer::ConvertFramebufferRectangle(const MathUtil::Rectangle& rect, - u32 fb_width, u32 fb_height) + u32 fb_width, u32 fb_height) const { MathUtil::Rectangle ret = rect; if (g_ActiveConfig.backend_info.bUsesLowerLeftOrigin) @@ -682,7 +682,7 @@ MathUtil::Rectangle Renderer::ConvertFramebufferRectangle(const MathUtil::R return ret; } -MathUtil::Rectangle Renderer::ConvertEFBRectangle(const MathUtil::Rectangle& rc) +MathUtil::Rectangle Renderer::ConvertEFBRectangle(const MathUtil::Rectangle& rc) const { MathUtil::Rectangle result; result.left = EFBToScaledX(rc.left); @@ -827,7 +827,7 @@ void Renderer::SetWindowSize(int width, int height) } } -std::tuple Renderer::CalculateOutputDimensions(int width, int height) +std::tuple Renderer::CalculateOutputDimensions(int width, int height) const { width = std::max(width, 1); height = std::max(height, 1); @@ -1356,7 +1356,7 @@ void Renderer::RenderXFBToScreen(const MathUtil::Rectangle& target_rc, } } -bool Renderer::IsFrameDumping() +bool Renderer::IsFrameDumping() const { if (m_screenshot_request.IsSet()) return true; diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index 116080a1a8..6ff7f410dd 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -159,13 +159,14 @@ public: // Converts an upper-left to lower-left if required by the backend, optionally // clamping to the framebuffer size. MathUtil::Rectangle ConvertFramebufferRectangle(const MathUtil::Rectangle& rect, - u32 fb_width, u32 fb_height); - MathUtil::Rectangle ConvertFramebufferRectangle(const MathUtil::Rectangle& rect, - const AbstractFramebuffer* framebuffer); + u32 fb_width, u32 fb_height) const; + MathUtil::Rectangle + ConvertFramebufferRectangle(const MathUtil::Rectangle& rect, + const AbstractFramebuffer* framebuffer) const; // EFB coordinate conversion functions // Use this to convert a whole native EFB rect to backbuffer coordinates - MathUtil::Rectangle ConvertEFBRectangle(const MathUtil::Rectangle& rc); + MathUtil::Rectangle ConvertEFBRectangle(const MathUtil::Rectangle& rc) const; const MathUtil::Rectangle& GetTargetRectangle() const { return m_target_rectangle; } float CalculateDrawAspectRatio() const; @@ -324,7 +325,7 @@ protected: private: void RunFrameDumps(); - std::tuple CalculateOutputDimensions(int width, int height); + std::tuple CalculateOutputDimensions(int width, int height) const; PEControl::PixelFormat m_prev_efb_format = PEControl::INVALID_FMT; unsigned int m_efb_scale = 1; @@ -373,7 +374,7 @@ private: void DumpFrameToImage(const FrameDumpConfig& config); void ShutdownFrameDumping(); - bool IsFrameDumping(); + bool IsFrameDumping() const; // Checks that the frame dump render texture exists and is the correct size. bool CheckFrameDumpRenderTexture(u32 target_width, u32 target_height);