diff options
| author | 2021-09-24 01:21:07 -0400 | |
|---|---|---|
| committer | 2021-09-24 15:52:05 -0400 | |
| commit | 73666fb2622a5f6a7ab9f92c9a46ce2e215c4e83 (patch) | |
| tree | 31ecba073091bae2a424f3d0b6215591408edca3 /src/video_core | |
| parent | ci: Update clang format version (diff) | |
| download | yuzu-73666fb2622a5f6a7ab9f92c9a46ce2e215c4e83.tar.gz yuzu-73666fb2622a5f6a7ab9f92c9a46ce2e215c4e83.tar.xz yuzu-73666fb2622a5f6a7ab9f92c9a46ce2e215c4e83.zip | |
general: Update style to clang-format-12
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_vulkan/renderer_vulkan.cpp | 13 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/texture_cache/slot_vector.h | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index adb6b7a3b..74822814d 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp | |||
| @@ -97,19 +97,14 @@ RendererVulkan::RendererVulkan(Core::TelemetrySession& telemetry_session_, | |||
| 97 | Core::Frontend::EmuWindow& emu_window, | 97 | Core::Frontend::EmuWindow& emu_window, |
| 98 | Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_, | 98 | Core::Memory::Memory& cpu_memory_, Tegra::GPU& gpu_, |
| 99 | std::unique_ptr<Core::Frontend::GraphicsContext> context_) try | 99 | std::unique_ptr<Core::Frontend::GraphicsContext> context_) try |
| 100 | : RendererBase(emu_window, std::move(context_)), | 100 | : RendererBase(emu_window, std::move(context_)), telemetry_session(telemetry_session_), |
| 101 | telemetry_session(telemetry_session_), | 101 | cpu_memory(cpu_memory_), gpu(gpu_), library(OpenLibrary()), |
| 102 | cpu_memory(cpu_memory_), | ||
| 103 | gpu(gpu_), | ||
| 104 | library(OpenLibrary()), | ||
| 105 | instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type, | 102 | instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type, |
| 106 | true, Settings::values.renderer_debug.GetValue())), | 103 | true, Settings::values.renderer_debug.GetValue())), |
| 107 | debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr), | 104 | debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr), |
| 108 | surface(CreateSurface(instance, render_window)), | 105 | surface(CreateSurface(instance, render_window)), |
| 109 | device(CreateDevice(instance, dld, *surface)), | 106 | device(CreateDevice(instance, dld, *surface)), memory_allocator(device, false), |
| 110 | memory_allocator(device, false), | 107 | state_tracker(gpu), scheduler(device, state_tracker), |
| 111 | state_tracker(gpu), | ||
| 112 | scheduler(device, state_tracker), | ||
| 113 | swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width, | 108 | swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width, |
| 114 | render_window.GetFramebufferLayout().height, false), | 109 | render_window.GetFramebufferLayout().height, false), |
| 115 | blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler, | 110 | blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler, |
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 7c0f91007..11cd41ad7 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |||
| @@ -507,8 +507,9 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { | |||
| 507 | vertex_attributes.push_back({ | 507 | vertex_attributes.push_back({ |
| 508 | .location = static_cast<u32>(index), | 508 | .location = static_cast<u32>(index), |
| 509 | .binding = 0, | 509 | .binding = 0, |
| 510 | .format = type == 1 ? VK_FORMAT_R32_SFLOAT | 510 | .format = type == 1 ? VK_FORMAT_R32_SFLOAT |
| 511 | : type == 2 ? VK_FORMAT_R32_SINT : VK_FORMAT_R32_UINT, | 511 | : type == 2 ? VK_FORMAT_R32_SINT |
| 512 | : VK_FORMAT_R32_UINT, | ||
| 512 | .offset = 0, | 513 | .offset = 0, |
| 513 | }); | 514 | }); |
| 514 | } | 515 | } |
diff --git a/src/video_core/texture_cache/slot_vector.h b/src/video_core/texture_cache/slot_vector.h index 74cd3c9d8..50df06409 100644 --- a/src/video_core/texture_cache/slot_vector.h +++ b/src/video_core/texture_cache/slot_vector.h | |||
| @@ -31,8 +31,8 @@ struct SlotId { | |||
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | template <class T> | 33 | template <class T> |
| 34 | requires std::is_nothrow_move_assignable_v<T>&& | 34 | requires std::is_nothrow_move_assignable_v<T> && std::is_nothrow_move_constructible_v<T> |
| 35 | std::is_nothrow_move_constructible_v<T> class SlotVector { | 35 | class SlotVector { |
| 36 | public: | 36 | public: |
| 37 | class Iterator { | 37 | class Iterator { |
| 38 | friend SlotVector<T>; | 38 | friend SlotVector<T>; |