From bcd10bfda657d6af2d43c22de20b1d924e482b98 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 10 Aug 2014 22:01:42 -0400 Subject: [PATCH] Software: Fix function casing in SWRenderer --- Source/Core/VideoBackends/Software/DebugUtil.cpp | 2 +- Source/Core/VideoBackends/Software/EfbCopy.cpp | 4 ++-- Source/Core/VideoBackends/Software/SWRenderer.cpp | 12 ++++++------ Source/Core/VideoBackends/Software/SWRenderer.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 0a37d50e84..1d1dfe0c1a 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -159,7 +159,7 @@ static void DumpEfb(const std::string& filename) static void DumpColorTexture(const std::string& filename, u32 width, u32 height) { - TextureToPng(SWRenderer::getCurrentColorTexture(), width * 4, filename, width, height, true); + TextureToPng(SWRenderer::GetCurrentColorTexture(), width * 4, filename, width, height, true); } void DrawObjectBuffer(s16 x, s16 y, u8 *color, int bufferBase, int subBuffer, const char *name) diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp index 5c4e1e24c3..6a5e3a7abe 100644 --- a/Source/Core/VideoBackends/Software/EfbCopy.cpp +++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp @@ -45,12 +45,12 @@ namespace EfbCopy else { // Ask SWRenderer for the next color texture - u8 *colorTexture = SWRenderer::getNextColorTexture(); + u8 *colorTexture = SWRenderer::GetNextColorTexture(); EfbInterface::BypassXFB(colorTexture, fbWidth, fbHeight, sourceRc, Gamma); // Tell SWRenderer we are now finished with it. - SWRenderer::swapColorTexture(); + SWRenderer::SwapColorTexture(); // FifoPlayer is broken and never calls BeginFrame/EndFrame. // Hence, we manually force a swap now. This emulates the behavior diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index e098c5a2f4..e8d2477f4c 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -153,17 +153,17 @@ void SWRenderer::DrawDebugText() SWRenderer::RenderText(debugtext.c_str(), 20, 20, 0xFFFFFF00); } -u8* SWRenderer::getNextColorTexture() +u8* SWRenderer::GetNextColorTexture() { return s_xfbColorTexture[!s_currentColorTexture]; } -u8* SWRenderer::getCurrentColorTexture() +u8* SWRenderer::GetCurrentColorTexture() { return s_xfbColorTexture[s_currentColorTexture]; } -void SWRenderer::swapColorTexture() +void SWRenderer::SwapColorTexture() { s_currentColorTexture = !s_currentColorTexture; } @@ -177,7 +177,7 @@ void SWRenderer::UpdateColorTexture(EfbInterface::yuv422_packed *xfb, u32 fbWidt } u32 offset = 0; - u8 *TexturePointer = getNextColorTexture(); + u8 *TexturePointer = GetNextColorTexture(); for (u16 y = 0; y < fbHeight; y++) { @@ -203,7 +203,7 @@ void SWRenderer::UpdateColorTexture(EfbInterface::yuv422_packed *xfb, u32 fbWidt } xfb += fbWidth; } - swapColorTexture(); + SwapColorTexture(); } // Called on the GPU thread @@ -211,7 +211,7 @@ void SWRenderer::Swap(u32 fbWidth, u32 fbHeight) { GLInterface->Update(); // just updates the render window position and the backbuffer size if (!g_SWVideoConfig.bHwRasterizer) - SWRenderer::DrawTexture(getCurrentColorTexture(), fbWidth, fbHeight); + SWRenderer::DrawTexture(GetCurrentColorTexture(), fbWidth, fbHeight); swstats.frameCount++; SWRenderer::SwapBuffer(); diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h index e9ac11c967..08abc1fa74 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.h +++ b/Source/Core/VideoBackends/Software/SWRenderer.h @@ -18,9 +18,9 @@ namespace SWRenderer void RenderText(const char* pstr, int left, int top, u32 color); void DrawDebugText(); - u8* getNextColorTexture(); - u8* getCurrentColorTexture(); - void swapColorTexture(); + u8* GetNextColorTexture(); + u8* GetCurrentColorTexture(); + void SwapColorTexture(); void UpdateColorTexture(EfbInterface::yuv422_packed *xfb, u32 fbWidth, u32 fbHeight); void DrawTexture(u8 *texture, int width, int height);