mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-25 06:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13416 from jordan-woyak/unused-viewport-correction

Browse source 
VertexShaderManager: Eliminate unnecessary m_viewport_correction member.
This commit is contained in:
JMC47 2025-03-11 19:00:55 -04:00 • committed by GitHub
commit de997d616f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Core/State.cpp
View file

@ -99,7 +99,7 @@ static size_t s_state_writes_in_queue;
static std::condition_variable s_state_write_queue_is_empty; static std::condition_variable s_state_write_queue_is_empty;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
constexpr u32 STATE_VERSION = 170; // Last changed in PR 13219 constexpr u32 STATE_VERSION = 171; // Last changed in PR 13416
// Increase this if the StateExtendedHeader definition changes // Increase this if the StateExtendedHeader definition changes
constexpr u32 EXTENDED_HEADER_VERSION = 1; // Last changed in PR 12217 constexpr u32 EXTENDED_HEADER_VERSION = 1; // Last changed in PR 12217

11
Source/Core/VideoCommon/VertexShaderManager.cpp
View file

@ -8,15 +8,10 @@
#include <cstring> #include <cstring>
#include <iterator> #include <iterator>
#include "Common/BitSet.h"
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Config/Config.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/Matrix.h" #include "Common/Matrix.h"
#include "Core/Config/GraphicsSettings.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "VideoCommon/BPFunctions.h" #include "VideoCommon/BPFunctions.h"
#include "VideoCommon/BPMemory.h" #include "VideoCommon/BPMemory.h"
#include "VideoCommon/CPMemory.h" #include "VideoCommon/CPMemory.h"
@ -25,7 +20,6 @@
#include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h" #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h"
#include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h" #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h"
#include "VideoCommon/Statistics.h" #include "VideoCommon/Statistics.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VertexManagerBase.h"
#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
@ -39,8 +33,6 @@ void VertexShaderManager::Init()
constants = {}; constants = {};
// TODO: should these go inside ResetView()?
m_viewport_correction = Common::Matrix44::Identity();
m_projection_matrix = Common::Matrix44::Identity().data; m_projection_matrix = Common::Matrix44::Identity().data;
dirty = true; dirty = true;
@ -117,7 +109,7 @@ Common::Matrix44 VertexShaderManager::LoadProjectionMatrix()
PRIM_LOG("Projection: {} {} {} {} {} {}", rawProjection[0], rawProjection[1], rawProjection[2], PRIM_LOG("Projection: {} {} {} {} {} {}", rawProjection[0], rawProjection[1], rawProjection[2],
rawProjection[3], rawProjection[4], rawProjection[5]); 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) if (g_freelook_camera.IsActive() && xfmem.projection.type == ProjectionType::Perspective)
corrected_matrix *= g_freelook_camera.GetView(); corrected_matrix *= g_freelook_camera.GetView();
@ -483,7 +475,6 @@ void VertexShaderManager::TransformToClipSpace(const float* data, float* out, u3
void VertexShaderManager::DoState(PointerWrap& p) void VertexShaderManager::DoState(PointerWrap& p)
{ {
p.DoArray(m_projection_matrix); p.DoArray(m_projection_matrix);
p.Do(m_viewport_correction);
g_freelook_camera.DoState(p); g_freelook_camera.DoState(p);
p.Do(constants); p.Do(constants);

2
Source/Core/VideoCommon/VertexShaderManager.h
View file

@ -84,7 +84,5 @@ private:
// track changes // track changes
bool m_projection_graphics_mod_change = false; bool m_projection_graphics_mod_change = false;
Common::Matrix44 m_viewport_correction{};
Common::Matrix44 LoadProjectionMatrix(); Common::Matrix44 LoadProjectionMatrix();
}; };