VERY experimental Nintendo Switch 2 emulator
C++
Revert "Vulkan, OpenGL: Hook up storage buffer alignment code"
Liamecf4f380b634
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.hindex 627917ab6c..06fd40851a 100644--- a/src/video_core/buffer_cache/buffer_cache.h+++ b/src/video_core/buffer_cache/buffer_cache.h@@ -1938,21 +1938,14 @@ 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 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);+ const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr);if (!cpu_addr || size == 0) {return NULL_BINDING;}-- const VAddr cpu_end = Common::AlignUp(*cpu_addr + aligned_size, Core::Memory::YUZU_PAGESIZE);+ const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE);const Binding binding{.cpu_addr = *cpu_addr,- .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *cpu_addr),+ .size = is_written ? 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 bb19620739..a8c3f8b674 100644--- a/src/video_core/renderer_opengl/gl_buffer_cache.h+++ b/src/video_core/renderer_opengl/gl_buffer_cache.h@@ -160,10 +160,6 @@ 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 7dd854e0ff..9442193de3 100644--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp@@ -236,7 +236,6 @@ 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()),.support_geometry_shader_passthrough = device.HasGeometryShaderPassthrough(),} {if (use_asynchronous_shaders) {diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cppindex 1cfb4c2fff..b0153a5023 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp@@ -330,10 +330,6 @@ 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 06539c7332..183b336328 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.h+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h@@ -73,8 +73,6 @@ 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 7e69b11d8f..0684cceed3 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -344,7 +344,6 @@ 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()),.support_geometry_shader_passthrough = device.IsNvGeometryShaderPassthroughSupported(),};