From cb0a603c72cc8b80cfe162f1deebf0aedaa45e0c Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Thu, 29 Dec 2022 15:27:48 +0100 Subject: VideoCommon: De-globalize GeometryShaderManager class. --- Source/Core/VideoCommon/XFStructs.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'Source/Core/VideoCommon/XFStructs.cpp') diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp index 32d5085b76..a7738cc3eb 100644 --- a/Source/Core/VideoCommon/XFStructs.cpp +++ b/Source/Core/VideoCommon/XFStructs.cpp @@ -28,7 +28,8 @@ static void XFMemWritten(VertexShaderManager& vertex_shader_manager, u32 transfe vertex_shader_manager.InvalidateXFRange(baseAddress, baseAddress + transferSize); } -static void XFRegWritten(VertexShaderManager& vertex_shader_manager, u32 address, u32 value) +static void XFRegWritten(Core::System& system, VertexShaderManager& vertex_shader_manager, + u32 address, u32 value) { if (address >= XFMEM_REGISTERS_START && address < XFMEM_REGISTERS_END) { @@ -119,14 +120,11 @@ static void XFRegWritten(VertexShaderManager& vertex_shader_manager, u32 address case XFMEM_SETVIEWPORT + 3: case XFMEM_SETVIEWPORT + 4: case XFMEM_SETVIEWPORT + 5: - { - auto& system = Core::System::GetInstance(); g_vertex_manager->Flush(); vertex_shader_manager.SetViewportChanged(); system.GetPixelShaderManager().SetViewportChanged(); - GeometryShaderManager::SetViewportChanged(); + system.GetGeometryShaderManager().SetViewportChanged(); break; - } case XFMEM_SETPROJECTION: case XFMEM_SETPROJECTION + 1: @@ -137,7 +135,7 @@ static void XFRegWritten(VertexShaderManager& vertex_shader_manager, u32 address case XFMEM_SETPROJECTION + 6: g_vertex_manager->Flush(); vertex_shader_manager.SetProjectionChanged(); - GeometryShaderManager::SetProjectionChanged(); + system.GetGeometryShaderManager().SetProjectionChanged(); break; case XFMEM_SETNUMTEXGENS: // GXSetNumTexGens @@ -249,7 +247,7 @@ void LoadXFReg(u16 base_address, u8 transfer_size, const u8* data) { const u32 value = Common::swap32(data); - XFRegWritten(vertex_shader_manager, address, value); + XFRegWritten(system, vertex_shader_manager, address, value); ((u32*)&xfmem)[address] = value; data += 4; -- cgit v1.2.3