Merge pull request #11384 from AdmiralCurtiss/globals-pixelshadermanager

VideoCommon: De-globalize PixelShaderManager class.

1 files changed, 7 insertions, 5 deletions

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index 43e7de5e10..b4a40195c7 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -218,14 +218,14 @@ bool Renderer::IsBBoxEnabled() const
   return m_bounding_box->IsEnabled();
 }
 
-void Renderer::BBoxEnable()
+void Renderer::BBoxEnable(PixelShaderManager& pixel_shader_manager)
 {
-  m_bounding_box->Enable();
+  m_bounding_box->Enable(pixel_shader_manager);
 }
 
-void Renderer::BBoxDisable()
+void Renderer::BBoxDisable(PixelShaderManager& pixel_shader_manager)
 {
-  m_bounding_box->Disable();
+  m_bounding_box->Disable(pixel_shader_manager);
 }
 
 u16 Renderer::BBoxRead(u32 index)
@@ -421,7 +421,9 @@ bool Renderer::CalculateTargetSize()
   {
     m_target_width = new_efb_width;
     m_target_height = new_efb_height;
-    PixelShaderManager::SetEfbScaleChanged(EFBToScaledXf(1), EFBToScaledYf(1));
+    auto& system = Core::System::GetInstance();
+    auto& pixel_shader_manager = system.GetPixelShaderManager();
+    pixel_shader_manager.SetEfbScaleChanged(EFBToScaledXf(1), EFBToScaledYf(1));
     return true;
   }
   return false;