From 30cb4701bb6294b7e1882b14876fe625da9b32df Mon Sep 17 00:00:00 2001 From: Reg Tiangha Date: Tue, 16 Apr 2024 16:12:18 -0600 Subject: [PATCH] Rebase files after bad clang-format-18 application --- src/video_core/renderer_vulkan/renderer_vulkan.cpp | 3 +-- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index ddda119b1..6b7356574 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp @@ -54,8 +54,7 @@ RendererVulkan::RendererVulkan(Core::System& system, Pica::PicaCore& pica_, Frontend::EmuWindow& window, Frontend::EmuWindow* secondary_window) : RendererBase{system, window, secondary_window}, memory{system.Memory()}, pica{pica_}, instance{window, Settings::values.physical_device.GetValue()}, scheduler{instance}, - renderpass_cache{instance, scheduler}, pool{instance}, - main_window{window, instance, scheduler}, + renderpass_cache{instance, scheduler}, main_window{window, instance, scheduler}, vertex_buffer{instance, scheduler, vk::BufferUsageFlagBits::eVertexBuffer, VERTEX_BUFFER_SIZE}, update_queue{instance}, diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index b7d250fde..9c41f4883 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -61,10 +61,9 @@ RasterizerVulkan::RasterizerVulkan(Memory::MemorySystem& memory, Pica::PicaCore& Scheduler& scheduler, RenderManager& renderpass_cache, DescriptorUpdateQueue& update_queue_, u32 image_count) : RasterizerAccelerated{memory, pica}, instance{instance}, scheduler{scheduler}, - renderpass_cache{renderpass_cache}, - pipeline_cache{instance, scheduler, renderpass_cache, pool}, - runtime{instance, scheduler, renderpass_cache, pool, pipeline_cache.TextureProvider(), - image_count}, + renderpass_cache{renderpass_cache}, update_queue{update_queue_}, + pipeline_cache{instance, scheduler, renderpass_cache, update_queue}, + runtime{instance, scheduler, renderpass_cache, update_queue, image_count}, res_cache{memory, custom_tex_manager, runtime, regs, renderer}, stream_buffer{instance, scheduler, BUFFER_USAGE, STREAM_BUFFER_SIZE}, uniform_buffer{instance, scheduler, vk::BufferUsageFlagBits::eUniformBuffer,