diff options
| author | JMC47 <JMC4789@gmail.com> | 2025-03-11 19:00:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-11 19:00:55 -0400 |
| commit | de997d616fb013735bb40a3e0bb945c776bd1a16 (patch) | |
| tree | 18c51ab4926e8631a0ab2ad72c2cc78e30869e5e /Source/Core/VideoCommon | |
| parent | b7bd0a0836bb1015e38983b291264d7624e0a846 (diff) | |
| parent | c191ed532110212aa525e205a5bd35a54a8e3805 (diff) | |
Merge pull request #13416 from jordan-woyak/unused-viewport-correction
VertexShaderManager: Eliminate unnecessary m_viewport_correction member.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/VertexShaderManager.cpp | 11 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VertexShaderManager.h | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index bb3a7f2910..976cff00f6 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -8,15 +8,10 @@ #include <cstring> #include <iterator> -#include "Common/BitSet.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/Config/Config.h" #include "Common/Logging/Log.h" #include "Common/Matrix.h" -#include "Core/Config/GraphicsSettings.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/CPMemory.h" @@ -25,7 +20,6 @@ #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h" #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h" #include "VideoCommon/Statistics.h" -#include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" @@ -39,8 +33,6 @@ void VertexShaderManager::Init() constants = {}; - // TODO: should these go inside ResetView()? - m_viewport_correction = Common::Matrix44::Identity(); m_projection_matrix = Common::Matrix44::Identity().data; dirty = true; @@ -117,7 +109,7 @@ Common::Matrix44 VertexShaderManager::LoadProjectionMatrix() PRIM_LOG("Projection: {} {} {} {} {} {}", rawProjection[0], rawProjection[1], rawProjection[2], rawProjection[3], rawProjection[4], rawProjection[5]); - auto corrected_matrix = m_viewport_correction * Common::Matrix44::FromArray(m_projection_matrix); + auto corrected_matrix = Common::Matrix44::FromArray(m_projection_matrix); if (g_freelook_camera.IsActive() && xfmem.projection.type == ProjectionType::Perspective) corrected_matrix *= g_freelook_camera.GetView(); @@ -483,7 +475,6 @@ void VertexShaderManager::TransformToClipSpace(const float* data, float* out, u3 void VertexShaderManager::DoState(PointerWrap& p) { p.DoArray(m_projection_matrix); - p.Do(m_viewport_correction); g_freelook_camera.DoState(p); p.Do(constants); diff --git a/Source/Core/VideoCommon/VertexShaderManager.h b/Source/Core/VideoCommon/VertexShaderManager.h index e4e158f54d..9678aae58f 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.h +++ b/Source/Core/VideoCommon/VertexShaderManager.h @@ -84,7 +84,5 @@ private: // track changes bool m_projection_graphics_mod_change = false; - Common::Matrix44 m_viewport_correction{}; - Common::Matrix44 LoadProjectionMatrix(); }; |