Skip to content

Commit

Permalink
Software: Fix function casing in SWRenderer
Browse files Browse the repository at this point in the history
  • Loading branch information
lioncash committed Aug 11, 2014
1 parent f9f46f3 commit bcd10bf
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Source/Core/VideoBackends/Software/DebugUtil.cpp
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/VideoBackends/Software/EfbCopy.cpp
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Source/Core/VideoBackends/Software/SWRenderer.cpp
Expand Up @@ -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;
}
Expand All @@ -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++)
{
Expand All @@ -203,15 +203,15 @@ void SWRenderer::UpdateColorTexture(EfbInterface::yuv422_packed *xfb, u32 fbWidt
}
xfb += fbWidth;
}
swapColorTexture();
SwapColorTexture();
}

// Called on the GPU thread
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();
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/VideoBackends/Software/SWRenderer.h
Expand Up @@ -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);

Expand Down

0 comments on commit bcd10bf

Please sign in to comment.