VERY experimental Nintendo Switch 2 emulator
C++
Vulkan, OpenGL: Hook up storage buffer alignment code
Billy Laws195248d6feb2
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.hindex 06fd40851a..e6414df78f 100644--- a/src/video_core/buffer_cache/buffer_cache.h+++ b/src/video_core/buffer_cache/buffer_cache.h@@ -1938,14 +1938,20 @@ typename BufferCache<P>::Binding BufferCache<P>::StorageBufferBinding(GPUVAddr sbool is_written) const {const GPUVAddr gpu_addr = gpu_memory->Read<u64>(ssbo_addr);const u32 size = gpu_memory->Read<u32>(ssbo_addr + 8);- const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr);+ const u32 alignment = runtime.GetStorageBufferAlignment();++ const GPUVAddr aligned_gpu_addr = Common::AlignDown(gpu_addr, alignment);+ const u32 aligned_size = Common::AlignUp(static_cast<u32>(gpu_addr - aligned_gpu_addr) + size, alignment);++ const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(aligned_gpu_addr);if (!cpu_addr || size == 0) {return NULL_BINDING;}- const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE);++ const VAddr cpu_end = Common::AlignUp(*cpu_addr + aligned_size, Core::Memory::YUZU_PAGESIZE);const Binding binding{.cpu_addr = *cpu_addr,- .size = is_written ? size : static_cast<u32>(cpu_end - *cpu_addr),+ .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *cpu_addr),.buffer_id = BufferId{},};return binding;diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.hindex a8c3f8b674..bb19620739 100644--- a/src/video_core/renderer_opengl/gl_buffer_cache.h+++ b/src/video_core/renderer_opengl/gl_buffer_cache.h@@ -160,6 +160,10 @@ public:return device.CanReportMemoryUsage();}+ u32 GetStorageBufferAlignment() const {+ return static_cast<u32>(device.GetShaderStorageBufferAlignment());+ }+private:static constexpr std::array PABO_LUT{GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV, GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV,diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cppindex 03b6314ffc..01e0cddb6d 100644--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp@@ -236,6 +236,7 @@ ShaderCache::ShaderCache(RasterizerOpenGL& rasterizer_, Core::Frontend::EmuWindo.needs_demote_reorder = device.IsAmd(),.support_snorm_render_buffer = false,.support_viewport_index_layer = device.HasVertexViewportLayer(),+ .min_ssbo_alignment = static_cast<u32>(device.GetShaderStorageBufferAlignment()),} {if (use_asynchronous_shaders) {workers = CreateWorkers();diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cppindex 487d8b4160..bc78287cee 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp@@ -330,6 +330,10 @@ bool BufferCacheRuntime::CanReportMemoryUsage() const {return device.CanReportMemoryUsage();}+u32 BufferCacheRuntime::GetStorageBufferAlignment() const {+ return static_cast<u32>(device.GetStorageBufferAlignment());+}+void BufferCacheRuntime::Finish() {scheduler.Finish();}diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.hindex 183b336328..06539c7332 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.h+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h@@ -73,6 +73,8 @@ public:bool CanReportMemoryUsage() const;+ u32 GetStorageBufferAlignment() const;+[[nodiscard]] StagingBufferRef UploadStagingBuffer(size_t size);[[nodiscard]] StagingBufferRef DownloadStagingBuffer(size_t size);diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cppindex 4d7770bf86..4aaea0e128 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -344,6 +344,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& devicedriver_id == VK_DRIVER_ID_AMD_PROPRIETARY || driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE,.support_snorm_render_buffer = true,.support_viewport_index_layer = device.IsExtShaderViewportIndexLayerSupported(),+ .min_ssbo_alignment = static_cast<u32>(device.GetStorageBufferAlignment()),};if (device.GetMaxVertexInputAttributes() < Maxwell::NumVertexAttributes) {