From a4864176f5a7ec31591502ac6cafd2dd2a3cc4a8 Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Wed, 26 Aug 2026 05:09:12 -0400 Subject: [PATCH] Just a quick test --- src/video_core/buffer_cache/buffer_cache.h | 11 ----------- src/video_core/renderer_vulkan/vk_buffer_cache.h | 9 --------- src/video_core/vulkan_common/vulkan_device.h | 4 ---- 3 files changed, 24 deletions(-) diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index 95e032d3c1..00d29cc8a4 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -1079,17 +1079,6 @@ void BufferCache

::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32 const u32 size = (std::min)(binding.size, (*channel_state->uniform_buffer_sizes)[stage][index]); Buffer& buffer = slot_buffers[binding.buffer_id]; TouchBuffer(buffer, binding.buffer_id); - if constexpr (USE_UNIFIED_MEMORY) { - const auto window = TryResolveUnifiedRange(device_addr, size); - if (window && runtime.IsUnifiedUniformRange(size, window->offset)) { - channel_state->fast_bound_uniform_buffers[stage] &= ~(1u << binding_index); - channel_state->uniform_buffer_binding_sizes[stage][binding_index] = size; - runtime.BindUniformBuffer(runtime.UnifiedWindowBuffer(window->window), - runtime.UnifiedWindowAddress(window->window), - static_cast(window->offset), size); - return; - } - } const bool has_host_buffer = binding.buffer_id != NULL_BUFFER_ID; const u32 offset = has_host_buffer ? buffer.Offset(device_addr) : 0; const bool needs_alignment_stream = [&]() { diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index 06c1e3ae66..9f42c21496 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -241,10 +241,6 @@ public: BindBuffer(buffer, offset, size); } - void BindUniformBuffer(VkBuffer buffer, VkDeviceAddress address, u32 offset, u32 size) { - guest_descriptor_queue.AddBuffer(buffer, address, offset, size); - } - void BindStorageBuffer(const Buffer& buffer, u32 offset, u32 size, [[maybe_unused]] bool is_written) { BindBuffer(buffer, offset, size); @@ -273,11 +269,6 @@ public: (offset % device.GetStorageBufferAlignment()) == 0; } - [[nodiscard]] bool IsUnifiedUniformRange(u32 size, u64 offset) const { - return size <= device.GetMaxUniformBufferRange() && - (offset % device.GetUniformBufferAlignment()) == 0; - } - [[nodiscard]] bool IsUnifiedIndexRange(PrimitiveTopology topology, IndexFormat index_format, u64 offset) const; diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index a41baa743d..cdd683f016 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -360,10 +360,6 @@ public: return properties.properties.limits.maxStorageBufferRange; } - VkDeviceSize GetMaxUniformBufferRange() const { - return properties.properties.limits.maxUniformBufferRange; - } - std::array GetMaxComputeWorkGroupCount() const { const auto& count = properties.properties.limits.maxComputeWorkGroupCount; return {count[0], count[1], count[2]};