ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VideoCommon/RenderBase: Make functions const where applicable

This commit is contained in:
Lioncash 2019-08-04 22:45:25 -04:00
parent 7f6abfb0bf
commit dd5b8895fe
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -665,13 +665,13 @@ void Renderer::ScaleTexture(AbstractFramebuffer* dst_framebuffer,
MathUtil::Rectangle<int> MathUtil::Rectangle<int>
Renderer::ConvertFramebufferRectangle(const MathUtil::Rectangle<int>& rect, Renderer::ConvertFramebufferRectangle(const MathUtil::Rectangle<int>& rect,
const AbstractFramebuffer* framebuffer) const AbstractFramebuffer* framebuffer) const
{ {
return ConvertFramebufferRectangle(rect, framebuffer->GetWidth(), framebuffer->GetHeight()); return ConvertFramebufferRectangle(rect, framebuffer->GetWidth(), framebuffer->GetHeight());
} }
MathUtil::Rectangle<int> Renderer::ConvertFramebufferRectangle(const MathUtil::Rectangle<int>& rect, MathUtil::Rectangle<int> Renderer::ConvertFramebufferRectangle(const MathUtil::Rectangle<int>& rect,
u32 fb_width, u32 fb_height) u32 fb_width, u32 fb_height) const
{ {
MathUtil::Rectangle<int> ret = rect; MathUtil::Rectangle<int> ret = rect;
if (g_ActiveConfig.backend_info.bUsesLowerLeftOrigin) if (g_ActiveConfig.backend_info.bUsesLowerLeftOrigin)
@ -682,7 +682,7 @@ MathUtil::Rectangle<int> Renderer::ConvertFramebufferRectangle(const MathUtil::R
return ret; return ret;
} }
MathUtil::Rectangle<int> Renderer::ConvertEFBRectangle(const MathUtil::Rectangle<int>& rc) MathUtil::Rectangle<int> Renderer::ConvertEFBRectangle(const MathUtil::Rectangle<int>& rc) const
{ {
MathUtil::Rectangle<int> result; MathUtil::Rectangle<int> result;
result.left = EFBToScaledX(rc.left); result.left = EFBToScaledX(rc.left);
@ -827,7 +827,7 @@ void Renderer::SetWindowSize(int width, int height)
} }
} }
std::tuple<int, int> Renderer::CalculateOutputDimensions(int width, int height) std::tuple<int, int> Renderer::CalculateOutputDimensions(int width, int height) const
{ {
width = std::max(width, 1); width = std::max(width, 1);
height = std::max(height, 1); height = std::max(height, 1);
@ -1356,7 +1356,7 @@ void Renderer::RenderXFBToScreen(const MathUtil::Rectangle<int>& target_rc,
} }
} }
bool Renderer::IsFrameDumping() bool Renderer::IsFrameDumping() const
{ {
if (m_screenshot_request.IsSet()) if (m_screenshot_request.IsSet())
return true; return true;

13
Source/Core/VideoCommon/RenderBase.h
View File

@ -159,13 +159,14 @@ public:
// Converts an upper-left to lower-left if required by the backend, optionally // Converts an upper-left to lower-left if required by the backend, optionally
// clamping to the framebuffer size. // clamping to the framebuffer size.
MathUtil::Rectangle<int> ConvertFramebufferRectangle(const MathUtil::Rectangle<int>& rect, MathUtil::Rectangle<int> ConvertFramebufferRectangle(const MathUtil::Rectangle<int>& rect,
u32 fb_width, u32 fb_height); u32 fb_width, u32 fb_height) const;
MathUtil::Rectangle<int> ConvertFramebufferRectangle(const MathUtil::Rectangle<int>& rect, MathUtil::Rectangle<int>
const AbstractFramebuffer* framebuffer); ConvertFramebufferRectangle(const MathUtil::Rectangle<int>& rect,
const AbstractFramebuffer* framebuffer) const;
// EFB coordinate conversion functions // EFB coordinate conversion functions
// Use this to convert a whole native EFB rect to backbuffer coordinates // Use this to convert a whole native EFB rect to backbuffer coordinates
MathUtil::Rectangle<int> ConvertEFBRectangle(const MathUtil::Rectangle<int>& rc); MathUtil::Rectangle<int> ConvertEFBRectangle(const MathUtil::Rectangle<int>& rc) const;
const MathUtil::Rectangle<int>& GetTargetRectangle() const { return m_target_rectangle; } const MathUtil::Rectangle<int>& GetTargetRectangle() const { return m_target_rectangle; }
float CalculateDrawAspectRatio() const; float CalculateDrawAspectRatio() const;
@ -324,7 +325,7 @@ protected:
private: private:
void RunFrameDumps(); void RunFrameDumps();
std::tuple<int, int> CalculateOutputDimensions(int width, int height); std::tuple<int, int> CalculateOutputDimensions(int width, int height) const;
PEControl::PixelFormat m_prev_efb_format = PEControl::INVALID_FMT; PEControl::PixelFormat m_prev_efb_format = PEControl::INVALID_FMT;
unsigned int m_efb_scale = 1; unsigned int m_efb_scale = 1;
@ -373,7 +374,7 @@ private:
void DumpFrameToImage(const FrameDumpConfig& config); void DumpFrameToImage(const FrameDumpConfig& config);
void ShutdownFrameDumping(); void ShutdownFrameDumping();
bool IsFrameDumping(); bool IsFrameDumping() const;
// Checks that the frame dump render texture exists and is the correct size. // Checks that the frame dump render texture exists and is the correct size.
bool CheckFrameDumpRenderTexture(u32 target_width, u32 target_height); bool CheckFrameDumpRenderTexture(u32 target_width, u32 target_height);