Parcourir la source

Merge pull request #4126 from lioncash/noexcept

vulkan/wrapper: Remove noexcept from GetSurfaceCapabilitiesKHR()
bunnei il y a 6 ans
Parent
commit
c27c76ed43

+ 1 - 2
src/video_core/renderer_vulkan/wrapper.cpp

@@ -725,8 +725,7 @@ bool PhysicalDevice::GetSurfaceSupportKHR(u32 queue_family_index, VkSurfaceKHR s
     return supported == VK_TRUE;
     return supported == VK_TRUE;
 }
 }
 
 
-VkSurfaceCapabilitiesKHR PhysicalDevice::GetSurfaceCapabilitiesKHR(VkSurfaceKHR surface) const
-    noexcept {
+VkSurfaceCapabilitiesKHR PhysicalDevice::GetSurfaceCapabilitiesKHR(VkSurfaceKHR surface) const {
     VkSurfaceCapabilitiesKHR capabilities;
     VkSurfaceCapabilitiesKHR capabilities;
     Check(dld->vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device, surface, &capabilities));
     Check(dld->vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physical_device, surface, &capabilities));
     return capabilities;
     return capabilities;

+ 1 - 1
src/video_core/renderer_vulkan/wrapper.h

@@ -779,7 +779,7 @@ public:
 
 
     bool GetSurfaceSupportKHR(u32 queue_family_index, VkSurfaceKHR) const;
     bool GetSurfaceSupportKHR(u32 queue_family_index, VkSurfaceKHR) const;
 
 
-    VkSurfaceCapabilitiesKHR GetSurfaceCapabilitiesKHR(VkSurfaceKHR) const noexcept;
+    VkSurfaceCapabilitiesKHR GetSurfaceCapabilitiesKHR(VkSurfaceKHR) const;
 
 
     std::vector<VkSurfaceFormatKHR> GetSurfaceFormatsKHR(VkSurfaceKHR) const;
     std::vector<VkSurfaceFormatKHR> GetSurfaceFormatsKHR(VkSurfaceKHR) const;