VERY experimental Nintendo Switch 2 emulator
C++
shaders: Track local memory usage
ameerj28cecc6cd8eb
diff --git a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cppindex 5a41952175..70292686fc 100644--- a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp+++ b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp@@ -424,6 +424,10 @@ void VisitUsages(Info& info, IR::Inst& inst) {info.used_constant_buffer_types |= IR::Type::U32 | IR::Type::U32x2;info.used_storage_buffer_types |= IR::Type::U32 | IR::Type::U32x2 | IR::Type::U32x4;break;+ case IR::Opcode::LoadLocal:+ case IR::Opcode::WriteLocal:+ info.uses_local_memory = true;+ break;default:break;}diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.hindex d308db9424..b4b4afd37d 100644--- a/src/shader_recompiler/shader_info.h+++ b/src/shader_recompiler/shader_info.h@@ -172,6 +172,7 @@ struct Info {bool stores_indexed_attributes{};bool stores_global_memory{};+ bool uses_local_memory{};bool uses_fp16{};bool uses_fp64{};diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp b/src/video_core/renderer_opengl/gl_compute_pipeline.cppindex 3151c0db8b..f9ca55c36d 100644--- a/src/video_core/renderer_opengl/gl_compute_pipeline.cpp+++ b/src/video_core/renderer_opengl/gl_compute_pipeline.cpp@@ -63,6 +63,7 @@ ComputePipeline::ComputePipeline(const Device& device, TextureCache& texture_cacwrites_global_memory = !use_storage_buffers &&std::ranges::any_of(info.storage_buffers_descriptors,[](const auto& desc) { return desc.is_written; });+ uses_local_memory = info.uses_local_memory;if (force_context_flush) {std::scoped_lock lock{built_mutex};built_fence.Create();diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.h b/src/video_core/renderer_opengl/gl_compute_pipeline.hindex 9bcc72b59e..c26b4fa5e2 100644--- a/src/video_core/renderer_opengl/gl_compute_pipeline.h+++ b/src/video_core/renderer_opengl/gl_compute_pipeline.h@@ -59,6 +59,10 @@ public:return writes_global_memory;}+ [[nodiscard]] bool UsesLocalMemory() const noexcept {+ return uses_local_memory;+ }+void SetEngine(Tegra::Engines::KeplerCompute* kepler_compute_,Tegra::MemoryManager* gpu_memory_) {kepler_compute = kepler_compute_;@@ -84,6 +88,7 @@ private:bool use_storage_buffers{};bool writes_global_memory{};+ bool uses_local_memory{};std::mutex built_mutex;std::condition_variable built_condvar;diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp b/src/video_core/renderer_opengl/gl_graphics_pipeline.cppindex c58f760b8f..23a48c6fe7 100644--- a/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp+++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.cpp@@ -215,6 +215,7 @@ GraphicsPipeline::GraphicsPipeline(const Device& device, TextureCache& texture_cwrites_global_memory |= std::ranges::any_of(info.storage_buffers_descriptors, [](const auto& desc) { return desc.is_written; });+ uses_local_memory |= info.uses_local_memory;}ASSERT(num_textures <= MAX_TEXTURES);ASSERT(num_images <= MAX_IMAGES);diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.h b/src/video_core/renderer_opengl/gl_graphics_pipeline.hindex 7bab3be0a7..7b3d7eae81 100644--- a/src/video_core/renderer_opengl/gl_graphics_pipeline.h+++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.h@@ -98,6 +98,10 @@ public:return writes_global_memory;}+ [[nodiscard]] bool UsesLocalMemory() const noexcept {+ return uses_local_memory;+ }+[[nodiscard]] bool IsBuilt() noexcept;template <typename Spec>@@ -146,6 +150,7 @@ private:bool use_storage_buffers{};bool writes_global_memory{};+ bool uses_local_memory{};static constexpr std::size_t XFB_ENTRY_STRIDE = 3;GLsizei num_xfb_attribs{};diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cppindex d032885168..edf527f2d3 100644--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp@@ -222,7 +222,9 @@ void RasterizerOpenGL::PrepareDraw(bool is_indexed, Func&& draw_func) {gpu.TickWork();std::scoped_lock lock{buffer_cache.mutex, texture_cache.mutex};- program_manager.LocalMemoryWarmup();+ if (pipeline->UsesLocalMemory()) {+ program_manager.LocalMemoryWarmup();+ }pipeline->SetEngine(maxwell3d, gpu_memory);pipeline->Configure(is_indexed);@@ -372,7 +374,9 @@ void RasterizerOpenGL::DispatchCompute() {if (!pipeline) {return;}- program_manager.LocalMemoryWarmup();+ if (pipeline->UsesLocalMemory()) {+ program_manager.LocalMemoryWarmup();+ }pipeline->SetEngine(kepler_compute, gpu_memory);pipeline->Configure();const auto& qmd{kepler_compute->launch_description};