From 50625728e089c8868eb919244d4e6eafa4f4cf79 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Wed, 28 Dec 2022 15:38:46 +0100 Subject: VideoCommon: De-globalize VertexShaderManager class. --- Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp') diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 485d718723..7566611041 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -223,14 +223,15 @@ void ProgramShaderCache::UploadConstants() { auto& system = Core::System::GetInstance(); auto& pixel_shader_manager = system.GetPixelShaderManager(); - if (pixel_shader_manager.dirty || VertexShaderManager::dirty || GeometryShaderManager::dirty) + auto& vertex_shader_manager = system.GetVertexShaderManager(); + if (pixel_shader_manager.dirty || vertex_shader_manager.dirty || GeometryShaderManager::dirty) { auto buffer = s_buffer->Map(s_ubo_buffer_size, s_ubo_align); memcpy(buffer.first, &pixel_shader_manager.constants, sizeof(PixelShaderConstants)); memcpy(buffer.first + Common::AlignUp(sizeof(PixelShaderConstants), s_ubo_align), - &VertexShaderManager::constants, sizeof(VertexShaderConstants)); + &vertex_shader_manager.constants, sizeof(VertexShaderConstants)); memcpy(buffer.first + Common::AlignUp(sizeof(PixelShaderConstants), s_ubo_align) + Common::AlignUp(sizeof(VertexShaderConstants), s_ubo_align), @@ -248,7 +249,7 @@ void ProgramShaderCache::UploadConstants() sizeof(GeometryShaderConstants)); pixel_shader_manager.dirty = false; - VertexShaderManager::dirty = false; + vertex_shader_manager.dirty = false; GeometryShaderManager::dirty = false; ADDSTAT(g_stats.this_frame.bytes_uniform_streamed, s_ubo_buffer_size); -- cgit v1.2.3