diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-12-25 06:42:03 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-12-31 06:07:33 +0100 |
commit | 53ea06dc17ccf9232aa3326a4621500058f9d253 (patch) | |
tree | 944449c1810bd515d2b7882c2b2b15cf4a32f9e7 /src/video_core/vulkan_common | |
parent | renderer_vulkan: Throw when enumerating devices fails (diff) | |
download | yuzu-53ea06dc17ccf9232aa3326a4621500058f9d253.tar yuzu-53ea06dc17ccf9232aa3326a4621500058f9d253.tar.gz yuzu-53ea06dc17ccf9232aa3326a4621500058f9d253.tar.bz2 yuzu-53ea06dc17ccf9232aa3326a4621500058f9d253.tar.lz yuzu-53ea06dc17ccf9232aa3326a4621500058f9d253.tar.xz yuzu-53ea06dc17ccf9232aa3326a4621500058f9d253.tar.zst yuzu-53ea06dc17ccf9232aa3326a4621500058f9d253.zip |
Diffstat (limited to 'src/video_core/vulkan_common')
-rw-r--r-- | src/video_core/vulkan_common/vulkan_wrapper.cpp | 7 | ||||
-rw-r--r-- | src/video_core/vulkan_common/vulkan_wrapper.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index 8698c3f92..5e15ad607 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -580,7 +580,7 @@ void Semaphore::SetObjectNameEXT(const char* name) const { Device Device::Create(VkPhysicalDevice physical_device, Span<VkDeviceQueueCreateInfo> queues_ci, Span<const char*> enabled_extensions, const void* next, - DeviceDispatch& dispatch) noexcept { + DeviceDispatch& dispatch) { const VkDeviceCreateInfo ci{ .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .pNext = next, @@ -593,11 +593,8 @@ Device Device::Create(VkPhysicalDevice physical_device, Span<VkDeviceQueueCreate .ppEnabledExtensionNames = enabled_extensions.data(), .pEnabledFeatures = nullptr, }; - VkDevice device; - if (dispatch.vkCreateDevice(physical_device, &ci, nullptr, &device) != VK_SUCCESS) { - return {}; - } + Check(dispatch.vkCreateDevice(physical_device, &ci, nullptr, &device)); Load(device, dispatch); return Device(device, dispatch); } diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h index af3083c84..912cab46c 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.h +++ b/src/video_core/vulkan_common/vulkan_wrapper.h @@ -796,7 +796,7 @@ class Device : public Handle<VkDevice, NoOwner, DeviceDispatch> { public: static Device Create(VkPhysicalDevice physical_device, Span<VkDeviceQueueCreateInfo> queues_ci, Span<const char*> enabled_extensions, const void* next, - DeviceDispatch& dispatch) noexcept; + DeviceDispatch& dispatch); Queue GetQueue(u32 family_index) const noexcept; |