diff options
| author | 2023-05-06 21:55:39 -0700 | |
|---|---|---|
| committer | 2023-05-06 21:55:39 -0700 | |
| commit | 3547248ec2f303ba1ce5cf41548631ad00e7f739 (patch) | |
| tree | a7e99fa79998384d4f20361234bf77de57671571 /src/video_core/vulkan_common | |
| parent | Merge pull request #10174 from german77/motriod (diff) | |
| parent | qt_common: Remove yuzu prefix (diff) | |
| download | yuzu-3547248ec2f303ba1ce5cf41548631ad00e7f739.tar.gz yuzu-3547248ec2f303ba1ce5cf41548631ad00e7f739.tar.xz yuzu-3547248ec2f303ba1ce5cf41548631ad00e7f739.zip | |
Merge pull request #10125 from lat9nq/vsync-select
configuration: Expose separate swap present modes
Diffstat (limited to 'src/video_core/vulkan_common')
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_surface.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_surface.h | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/video_core/vulkan_common/vulkan_surface.cpp b/src/video_core/vulkan_common/vulkan_surface.cpp index fa9bafa20..c34599365 100644 --- a/src/video_core/vulkan_common/vulkan_surface.cpp +++ b/src/video_core/vulkan_common/vulkan_surface.cpp | |||
| @@ -23,10 +23,10 @@ | |||
| 23 | 23 | ||
| 24 | namespace Vulkan { | 24 | namespace Vulkan { |
| 25 | 25 | ||
| 26 | vk::SurfaceKHR CreateSurface(const vk::Instance& instance, | 26 | vk::SurfaceKHR CreateSurface( |
| 27 | const Core::Frontend::EmuWindow& emu_window) { | 27 | const vk::Instance& instance, |
| 28 | [[maybe_unused]] const Core::Frontend::EmuWindow::WindowSystemInfo& window_info) { | ||
| 28 | [[maybe_unused]] const vk::InstanceDispatch& dld = instance.Dispatch(); | 29 | [[maybe_unused]] const vk::InstanceDispatch& dld = instance.Dispatch(); |
| 29 | [[maybe_unused]] const auto& window_info = emu_window.GetWindowInfo(); | ||
| 30 | VkSurfaceKHR unsafe_surface = nullptr; | 30 | VkSurfaceKHR unsafe_surface = nullptr; |
| 31 | 31 | ||
| 32 | #ifdef _WIN32 | 32 | #ifdef _WIN32 |
diff --git a/src/video_core/vulkan_common/vulkan_surface.h b/src/video_core/vulkan_common/vulkan_surface.h index 5725143e6..5e18c06c4 100644 --- a/src/video_core/vulkan_common/vulkan_surface.h +++ b/src/video_core/vulkan_common/vulkan_surface.h | |||
| @@ -3,15 +3,12 @@ | |||
| 3 | 3 | ||
| 4 | #pragma once | 4 | #pragma once |
| 5 | 5 | ||
| 6 | #include "core/frontend/emu_window.h" | ||
| 6 | #include "video_core/vulkan_common/vulkan_wrapper.h" | 7 | #include "video_core/vulkan_common/vulkan_wrapper.h" |
| 7 | 8 | ||
| 8 | namespace Core::Frontend { | ||
| 9 | class EmuWindow; | ||
| 10 | } | ||
| 11 | |||
| 12 | namespace Vulkan { | 9 | namespace Vulkan { |
| 13 | 10 | ||
| 14 | [[nodiscard]] vk::SurfaceKHR CreateSurface(const vk::Instance& instance, | 11 | [[nodiscard]] vk::SurfaceKHR CreateSurface( |
| 15 | const Core::Frontend::EmuWindow& emu_window); | 12 | const vk::Instance& instance, const Core::Frontend::EmuWindow::WindowSystemInfo& window_info); |
| 16 | 13 | ||
| 17 | } // namespace Vulkan | 14 | } // namespace Vulkan |