Browse Source
Merge pull request #4126 from lioncash/noexcept
vulkan/wrapper: Remove noexcept from GetSurfaceCapabilitiesKHR()
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
3 deletions
-
src/video_core/renderer_vulkan/wrapper.cpp
-
src/video_core/renderer_vulkan/wrapper.h
|
|
|
@ -725,8 +725,7 @@ bool PhysicalDevice::GetSurfaceSupportKHR(u32 queue_family_index, VkSurfaceKHR s |
|
|
|
return supported == VK_TRUE; |
|
|
|
} |
|
|
|
|
|
|
|
VkSurfaceCapabilitiesKHR PhysicalDevice::GetSurfaceCapabilitiesKHR(VkSurfaceKHR surface) const |
|
|
|
noexcept { |
|
|
|
VkSurfaceCapabilitiesKHR PhysicalDevice::GetSurfaceCapabilitiesKHR(VkSurfaceKHR surface) const { |
|
|
|
VkSurfaceCapabilitiesKHR capabilities; |
|
|
|
Check(dld->vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device, surface, &capabilities)); |
|
|
|
return capabilities; |
|
|
|
|
|
|
|
@ -779,7 +779,7 @@ public: |
|
|
|
|
|
|
|
bool GetSurfaceSupportKHR(u32 queue_family_index, VkSurfaceKHR) const; |
|
|
|
|
|
|
|
VkSurfaceCapabilitiesKHR GetSurfaceCapabilitiesKHR(VkSurfaceKHR) const noexcept; |
|
|
|
VkSurfaceCapabilitiesKHR GetSurfaceCapabilitiesKHR(VkSurfaceKHR) const; |
|
|
|
|
|
|
|
std::vector<VkSurfaceFormatKHR> GetSurfaceFormatsKHR(VkSurfaceKHR) const; |
|
|
|
|
|
|
|
|
