diff options
| author | 2020-06-21 22:36:14 -0400 | |
|---|---|---|
| committer | 2020-06-21 22:36:14 -0400 | |
| commit | c27c76ed430acb04ff61e1540f7af1a4a4ee751b (patch) | |
| tree | 802d2647d9f7659813f8faad35f5896c3759f552 | |
| parent | Merge pull request #4134 from FearlessTobi/port-5322 (diff) | |
| parent | vulkan/wrapper: Remove noexcept from GetSurfaceCapabilitiesKHR() (diff) | |
| download | yuzu-c27c76ed430acb04ff61e1540f7af1a4a4ee751b.tar.gz yuzu-c27c76ed430acb04ff61e1540f7af1a4a4ee751b.tar.xz yuzu-c27c76ed430acb04ff61e1540f7af1a4a4ee751b.zip | |
Merge pull request #4126 from lioncash/noexcept
vulkan/wrapper: Remove noexcept from GetSurfaceCapabilitiesKHR()
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_vulkan/wrapper.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/wrapper.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/wrapper.cpp b/src/video_core/renderer_vulkan/wrapper.cpp index 2ce9b0626..42eff85d3 100644 --- a/src/video_core/renderer_vulkan/wrapper.cpp +++ b/src/video_core/renderer_vulkan/wrapper.cpp | |||
| @@ -725,8 +725,7 @@ bool PhysicalDevice::GetSurfaceSupportKHR(u32 queue_family_index, VkSurfaceKHR s | |||
| 725 | return supported == VK_TRUE; | 725 | return supported == VK_TRUE; |
| 726 | } | 726 | } |
| 727 | 727 | ||
| 728 | VkSurfaceCapabilitiesKHR PhysicalDevice::GetSurfaceCapabilitiesKHR(VkSurfaceKHR surface) const | 728 | VkSurfaceCapabilitiesKHR PhysicalDevice::GetSurfaceCapabilitiesKHR(VkSurfaceKHR surface) const { |
| 729 | noexcept { | ||
| 730 | VkSurfaceCapabilitiesKHR capabilities; | 729 | VkSurfaceCapabilitiesKHR capabilities; |
| 731 | Check(dld->vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device, surface, &capabilities)); | 730 | Check(dld->vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device, surface, &capabilities)); |
| 732 | return capabilities; | 731 | return capabilities; |
diff --git a/src/video_core/renderer_vulkan/wrapper.h b/src/video_core/renderer_vulkan/wrapper.h index 98937a77a..da42ca88e 100644 --- a/src/video_core/renderer_vulkan/wrapper.h +++ b/src/video_core/renderer_vulkan/wrapper.h | |||
| @@ -779,7 +779,7 @@ public: | |||
| 779 | 779 | ||
| 780 | bool GetSurfaceSupportKHR(u32 queue_family_index, VkSurfaceKHR) const; | 780 | bool GetSurfaceSupportKHR(u32 queue_family_index, VkSurfaceKHR) const; |
| 781 | 781 | ||
| 782 | VkSurfaceCapabilitiesKHR GetSurfaceCapabilitiesKHR(VkSurfaceKHR) const noexcept; | 782 | VkSurfaceCapabilitiesKHR GetSurfaceCapabilitiesKHR(VkSurfaceKHR) const; |
| 783 | 783 | ||
| 784 | std::vector<VkSurfaceFormatKHR> GetSurfaceFormatsKHR(VkSurfaceKHR) const; | 784 | std::vector<VkSurfaceFormatKHR> GetSurfaceFormatsKHR(VkSurfaceKHR) const; |
| 785 | 785 | ||