Adjust buffer stream size + reduce descriptor loads

src/video_core/renderer_vulkan/vk_blit_screen.cpp

@@ -33,8 +33,8 @@ BlitScreen::BlitScreen(Tegra::MaxwellDeviceMemoryManager& device_memory_, const
 BlitScreen::~BlitScreen() = default;
 
 void BlitScreen::WaitIdle(const Device& device) {
-    present_manager.WaitPresent();
     scheduler.Finish();
+    present_manager.WaitPresent();
     device.GetLogical().WaitIdle();
 }
 

src/video_core/renderer_vulkan/vk_descriptor_pool.cpp

@@ -125,7 +125,6 @@ vk::DescriptorSets DescriptorAllocator::AllocateDescriptors(size_t count) {
     throw vk::Exception(VK_ERROR_OUT_OF_POOL_MEMORY);
 }
 
-DescriptorPool::DescriptorPool(const Device& device_, Scheduler& scheduler) {}
 DescriptorPool::~DescriptorPool() = default;
 
 DescriptorAllocator DescriptorPool::Allocator(const Device& device, Scheduler& scheduler, VkDescriptorSetLayout layout, std::span<const Shader::Info> infos) {

src/video_core/renderer_vulkan/vk_descriptor_pool.h

@@ -65,7 +65,7 @@ private:
 
 class DescriptorPool {
 public:
-    explicit DescriptorPool(const Device& device, Scheduler& scheduler);
+    DescriptorPool() = default;
     ~DescriptorPool();
 
     DescriptorPool& operator=(const DescriptorPool&) = delete;

src/video_core/renderer_vulkan/vk_master_semaphore.cpp

@@ -353,7 +353,7 @@ void MasterSemaphore::WaitThread(std::stop_token token) {
             free_queue.push_front(std::move(fence));
             gpu_tick.store(host_tick, std::memory_order_release);
         }
-        gpu_tick.notify_one();
+        gpu_tick.notify_all();
     }
 }
 

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -206,7 +206,7 @@ RasterizerVulkan::RasterizerVulkan(Core::Frontend::EmuWindow& emu_window_, Tegra
                                    StateTracker& state_tracker_, Scheduler& scheduler_)
     : gpu{gpu_}, device_memory{device_memory_}, device{device_},
       memory_allocator{memory_allocator_}, state_tracker{state_tracker_}, scheduler{scheduler_},
-      staging_pool(device, memory_allocator, scheduler), descriptor_pool(device, scheduler),
+      staging_pool(device, memory_allocator, scheduler),
       guest_descriptor_queue(device, UpdateDescriptorQueue::GUEST_FRAME_PAYLOAD_SIZE,
                              device.IsExtDescriptorBufferSupported()),
       compute_pass_descriptor_queue(device, UpdateDescriptorQueue::COMPUTE_FRAME_PAYLOAD_SIZE),

src/video_core/renderer_vulkan/vk_scheduler.cpp

@@ -56,9 +56,7 @@ Scheduler::~Scheduler() = default;
 
 u64 Scheduler::Flush(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) {
     // When flushing, we only send data to the worker thread; no waiting is necessary.
-    const u64 signal_value = SubmitExecution(signal_semaphore, wait_semaphore);
+    return SubmitExecution(signal_semaphore, wait_semaphore);
-    AllocateNewContext();
-    return signal_value;
 }
 
 void Scheduler::Finish(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore) {
@@ -66,7 +64,6 @@ void Scheduler::Finish(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore)
     const u64 presubmit_tick = CurrentTick();
     SubmitExecution(signal_semaphore, wait_semaphore);
     Wait(presubmit_tick);
-    AllocateNewContext();
 }
 
 void Scheduler::WaitWorker() {
@@ -384,10 +381,6 @@ u64 Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_se
     return signal_value;
 }
 
-void Scheduler::AllocateNewContext() {
-    // Enable counters once again. These are disabled when a command buffer is finished.
-}
-
 void Scheduler::InvalidateState() {
     state.graphics_pipeline = nullptr;
     state.rescaling_defined = false;

src/video_core/renderer_vulkan/vk_scheduler.h

@@ -287,8 +287,6 @@ private:
 
     u64 SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_semaphore);
 
-    void AllocateNewContext();
-
     void EndPendingOperations();
 
     void EndRenderPass();

src/video_core/renderer_vulkan/vk_staging_buffer_pool.cpp

@@ -28,16 +28,7 @@ using namespace Common::Literals;
 // Maximum potential alignment of a Vulkan buffer
 constexpr VkDeviceSize MAX_ALIGNMENT = 256;
 
-// Stream buffer size in bytes
-// *NIX drivers are more sensitive to increased buffers for streaming.
-// Windows ones however, can intake bigger buffers and generally do not OOM.
-// - GTX 960 on Windows will not OOM with 256mib
-// - GT 1030 on ^NIX will OOM with 256mib
-#if defined(__FreeBSD__)
 constexpr VkDeviceSize MAX_STREAM_BUFFER_SIZE = 128_MiB;
-#else
-constexpr VkDeviceSize MAX_STREAM_BUFFER_SIZE = 256_MiB;
-#endif
 
 size_t GetStreamBufferSize(const Device& device) {
     if (!device.HasDebuggingToolAttached()) {

src/video_core/renderer_vulkan/vk_update_descriptor.h

@@ -40,8 +40,8 @@ class UpdateDescriptorQueue final {
     static constexpr size_t FRAMES_IN_FLIGHT = 8;
 
 public:
-    static constexpr size_t GUEST_FRAME_PAYLOAD_SIZE = 0x80000;
+    static constexpr size_t GUEST_FRAME_PAYLOAD_SIZE = 0x20000;
-    static constexpr size_t COMPUTE_FRAME_PAYLOAD_SIZE = 0x20000;
+    static constexpr size_t COMPUTE_FRAME_PAYLOAD_SIZE = 0x8000;
 
     explicit UpdateDescriptorQueue(const Device& device_, size_t frame_payload_size_,
                                    bool supports_descriptor_buffer_ = false);

src/video_core/vulkan_common/vulkan_device.h

@@ -1011,7 +1011,6 @@ FN_MAX_LIMIT_LIST
         return features2.features.multiViewport;
     }
 
-    /// Returns true if the device supports VK_KHR_maintenance5.
     /// Returns true if the device supports VK_KHR_maintenance4.
     bool IsKhrMaintenance4Supported() const {
         return extensions.maintenance4;