From 92fdac412bd740cf0b6128e897232bb4c893d77d Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 24 Oct 2013 14:06:48 +0200 Subject: [PATCH] VideoCommon: drop UpdateViewportWithCorrection It's only used once in BPFunction which itself is also only used once. So the setter is moved to BPStructs like all other ones. --- Source/Core/VideoCommon/Src/BPFunctions.cpp | 2 -- Source/Core/VideoCommon/Src/BPStructs.cpp | 1 + Source/Core/VideoCommon/Src/VertexShaderManager.cpp | 7 ------- Source/Core/VideoCommon/Src/VertexShaderManager.h | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp index 9f4f4f3060..43623a94a8 100644 --- a/Source/Core/VideoCommon/Src/BPFunctions.cpp +++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp @@ -49,8 +49,6 @@ void SetScissor() TargetRectangle trc = g_renderer->ConvertEFBRectangle(rc); g_renderer->SetScissorRect(trc); - - UpdateViewportWithCorrection(); } void SetLineWidth() diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index ab5789a078..e3ada3c0bf 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -185,6 +185,7 @@ void BPWritten(const BPCmd& bp) case BPMEM_SCISSORBR: // Scissor Rectable Bottom, Right case BPMEM_SCISSOROFFSET: // Scissor Offset SetScissor(); + VertexShaderManager::SetViewportChanged(); break; case BPMEM_LINEPTWIDTH: // Line Width SetLineWidth(); diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index d3bb07dd3a..6fa22c4b9c 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -175,13 +175,6 @@ static void ViewportCorrectionMatrix(Matrix44& result) void UpdateViewport(); -void UpdateViewportWithCorrection() -{ - // TODO: get rid of this function - ViewportCorrectionMatrix(s_viewportCorrection); - UpdateViewport(); -} - void VertexShaderManager::Init() { Dirty(); diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h index 60e23902f1..8b5875a8ac 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.h +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.h @@ -12,8 +12,6 @@ class PointerWrap; void UpdateProjectionHack(int iParams[], std::string sParams[]); -void UpdateViewportWithCorrection(); - // The non-API dependent parts. class VertexShaderManager {