diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/shader_recompiler/frontend/ir/patch.cpp | 2 | ||||
| -rw-r--r-- | src/shader_recompiler/frontend/ir/post_order.h | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/renderer_vulkan.cpp | 13 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_scheduler.h | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/shader_recompiler/frontend/ir/patch.cpp b/src/shader_recompiler/frontend/ir/patch.cpp index 1f770bc48..4c956a970 100644 --- a/src/shader_recompiler/frontend/ir/patch.cpp +++ b/src/shader_recompiler/frontend/ir/patch.cpp | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "shader_recompiler/frontend/ir/patch.h" | ||
| 6 | #include "shader_recompiler/exception.h" | 5 | #include "shader_recompiler/exception.h" |
| 6 | #include "shader_recompiler/frontend/ir/patch.h" | ||
| 7 | 7 | ||
| 8 | namespace Shader::IR { | 8 | namespace Shader::IR { |
| 9 | 9 | ||
diff --git a/src/shader_recompiler/frontend/ir/post_order.h b/src/shader_recompiler/frontend/ir/post_order.h index 58a0467a0..07bfbadc3 100644 --- a/src/shader_recompiler/frontend/ir/post_order.h +++ b/src/shader_recompiler/frontend/ir/post_order.h | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include "shader_recompiler/frontend/ir/basic_block.h" | ||
| 8 | #include "shader_recompiler/frontend/ir/abstract_syntax_list.h" | 7 | #include "shader_recompiler/frontend/ir/abstract_syntax_list.h" |
| 8 | #include "shader_recompiler/frontend/ir/basic_block.h" | ||
| 9 | 9 | ||
| 10 | namespace Shader::IR { | 10 | namespace Shader::IR { |
| 11 | 11 | ||
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp index 7e39b65bd..d50647ba7 100644 --- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp +++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp | |||
| @@ -97,14 +97,19 @@ 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_)), telemetry_session(telemetry_session_), | 100 | : RendererBase(emu_window, std::move(context_)), |
| 101 | cpu_memory(cpu_memory_), gpu(gpu_), library(OpenLibrary()), | 101 | telemetry_session(telemetry_session_), |
| 102 | cpu_memory(cpu_memory_), | ||
| 103 | gpu(gpu_), | ||
| 104 | library(OpenLibrary()), | ||
| 102 | instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type, | 105 | instance(CreateInstance(library, dld, VK_API_VERSION_1_1, render_window.GetWindowInfo().type, |
| 103 | true, Settings::values.renderer_debug.GetValue())), | 106 | true, Settings::values.renderer_debug.GetValue())), |
| 104 | debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr), | 107 | debug_callback(Settings::values.renderer_debug ? CreateDebugCallback(instance) : nullptr), |
| 105 | surface(CreateSurface(instance, render_window)), | 108 | surface(CreateSurface(instance, render_window)), |
| 106 | device(CreateDevice(instance, dld, *surface)), memory_allocator(device, false), | 109 | device(CreateDevice(instance, dld, *surface)), |
| 107 | state_tracker(gpu), scheduler(device, state_tracker), | 110 | memory_allocator(device, false), |
| 111 | state_tracker(gpu), | ||
| 112 | scheduler(device, state_tracker), | ||
| 108 | swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width, | 113 | swapchain(*surface, device, scheduler, render_window.GetFramebufferLayout().width, |
| 109 | render_window.GetFramebufferLayout().height, false), | 114 | render_window.GetFramebufferLayout().height, false), |
| 110 | blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler, | 115 | blit_screen(cpu_memory, render_window, device, memory_allocator, swapchain, scheduler, |
diff --git a/src/video_core/renderer_vulkan/vk_scheduler.h b/src/video_core/renderer_vulkan/vk_scheduler.h index 6600fb142..cf39a2363 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.h +++ b/src/video_core/renderer_vulkan/vk_scheduler.h | |||
| @@ -6,11 +6,11 @@ | |||
| 6 | 6 | ||
| 7 | #include <atomic> | 7 | #include <atomic> |
| 8 | #include <condition_variable> | 8 | #include <condition_variable> |
| 9 | #include <queue> | ||
| 10 | #include <cstddef> | 9 | #include <cstddef> |
| 11 | #include <memory> | 10 | #include <memory> |
| 12 | #include <thread> | 11 | #include <thread> |
| 13 | #include <utility> | 12 | #include <utility> |
| 13 | #include <queue> | ||
| 14 | 14 | ||
| 15 | #include "common/alignment.h" | 15 | #include "common/alignment.h" |
| 16 | #include "common/common_types.h" | 16 | #include "common/common_types.h" |