From 48aae964b43b005a31c3526c3c415309fd81b01a Mon Sep 17 00:00:00 2001
From: Dentomologist <dentomologist@gmail.com>
Date: Mon, 22 Sep 2025 16:07:19 -0700
Subject: [PATCH] OpenGL: Pass system to UploadConstants

---
 Source/Core/VideoBackends/OGL/OGLVertexManager.cpp   | 2 +-
 Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 3 +--
 Source/Core/VideoBackends/OGL/ProgramShaderCache.h   | 7 ++++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
index fcf07cf3a7f..0036bb21bae 100644
--- a/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
@@ -197,6 +197,6 @@ void VertexManager::CommitBuffer(u32 num_vertices, u32 vertex_stride, u32 num_in
 
 void VertexManager::UploadUniforms()
 {
-  ProgramShaderCache::UploadConstants();
+  ProgramShaderCache::UploadConstants(m_system);
 }
 }  // namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index 3241d217e06..0134c0a1b9d 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -221,9 +221,8 @@ u32 ProgramShaderCache::GetUniformBufferAlignment()
   return s_ubo_align;
 }
 
-void ProgramShaderCache::UploadConstants()
+void ProgramShaderCache::UploadConstants(Core::System& system)
 {
-  auto& system = Core::System::GetInstance();
   auto& pixel_shader_manager = system.GetPixelShaderManager();
   auto& vertex_shader_manager = system.GetVertexShaderManager();
   auto& geometry_shader_manager = system.GetGeometryShaderManager();
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
index c9a1b91f10c..0e1a25583ac 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@@ -12,6 +12,11 @@
 #include "Common/GL/GLUtil.h"
 #include "VideoCommon/AsyncShaderCompiler.h"
 
+namespace Core
+{
+class System;
+}
+
 namespace OGL
 {
 class OGLShader;
@@ -81,7 +86,7 @@ public:
                                      std::string_view gcode);
   static StreamBuffer* GetUniformBuffer();
   static u32 GetUniformBufferAlignment();
-  static void UploadConstants();
+  static void UploadConstants(Core::System& system);
   static void UploadConstants(const void* data, u32 data_size);
 
   static void Init();