From 729d02d699831868d16c7eaec1d8ca4c6c296921 Mon Sep 17 00:00:00 2001 From: psucien Date: Thu, 6 Jun 2024 21:47:24 +0200 Subject: [PATCH] renderer_vulkan: proper min uniform alignment --- src/video_core/renderer_vulkan/vk_compute_pipeline.cpp | 2 +- src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp index 66fee434..2ee4f026 100644 --- a/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_compute_pipeline.cpp @@ -83,7 +83,7 @@ ComputePipeline::~ComputePipeline() = default; void ComputePipeline::BindResources(Core::MemoryManager* memory, StreamBuffer& staging, VideoCore::TextureCache& texture_cache) const { - static constexpr u64 MinUniformAlignment = 64; + static const u64 MinUniformAlignment = instance.UniformMinAlignment(); const auto map_staging = [&](auto src, size_t size) { const auto [data, offset, _] = staging.Map(size, MinUniformAlignment); diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 0334c8e6..23cca386 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -278,7 +278,7 @@ void GraphicsPipeline::BuildDescSetLayout() { void GraphicsPipeline::BindResources(Core::MemoryManager* memory, StreamBuffer& staging, VideoCore::TextureCache& texture_cache) const { - static constexpr u64 MinUniformAlignment = 64; + static const u64 MinUniformAlignment = instance.UniformMinAlignment(); const auto map_staging = [&](auto src, size_t size) { const auto [data, offset, _] = staging.Map(size, MinUniformAlignment);