aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2023-01-07 10:40:21 -0600
committerGitHub <noreply@github.com>2023-01-07 10:40:21 -0600
commitcc92b7fd94a1a86da4a765eaa0756642907d95dc (patch)
treeaf5aef3120f848b70c039b6e9cf02a5f67ce76a8 /src
parentc0f17e1b272a4f235707c9e1a67f009d4ccd05f7 (diff)
parent444b25bae125bf318f08774aa1c335dedd502e6a (diff)
Merge pull request #9573 from liamwhite/optional
vulkan_device: avoid attempt to access empty optional
Diffstat (limited to 'src')
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 77aee802de..07c984c5e8 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -1520,8 +1520,12 @@ void Device::SetupFamilies(VkSurfaceKHR surface) {
LOG_ERROR(Render_Vulkan, "Device lacks a present queue");
throw vk::Exception(VK_ERROR_FEATURE_NOT_PRESENT);
}
- graphics_family = *graphics;
- present_family = *present;
+ if (graphics) {
+ graphics_family = *graphics;
+ }
+ if (present) {
+ present_family = *present;
+ }
}
void Device::SetupFeatures() {