diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-14 13:33:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 13:33:36 +0100 |
| commit | dd5485142f2d2d84b98483ea41bc36e03c4a16b7 (patch) | |
| tree | df20f02cc64773734086449546ebee063d8ce8ea /drivers/vulkan/vulkan_context.cpp | |
| parent | ffbaf715502f9e8af0a207d52b9c2274a4d930d8 (diff) | |
| parent | f09a37a8d5af37c9d7a450a7206ea57709b81db0 (diff) | |
Merge pull request #43531 from bruvzg/x11_fix_vlk_init_crash
Fixes crash if Vulkan presentation surface is not available.
Diffstat (limited to 'drivers/vulkan/vulkan_context.cpp')
| -rw-r--r-- | drivers/vulkan/vulkan_context.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vulkan/vulkan_context.cpp b/drivers/vulkan/vulkan_context.cpp index ebfd3e0454..28634d5e70 100644 --- a/drivers/vulkan/vulkan_context.cpp +++ b/drivers/vulkan/vulkan_context.cpp @@ -707,7 +707,8 @@ Error VulkanContext::_window_create(DisplayServer::WindowID p_window_id, VkSurfa // We use a single GPU, but we need a surface to initialize the // queues, so this process must be deferred until a surface // is created. - _initialize_queues(p_surface); + Error err = _initialize_queues(p_surface); + ERR_FAIL_COND_V(err != OK, ERR_CANT_CREATE); } Window window; |