diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2020-11-14 13:41:13 +0200 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2020-11-14 13:41:13 +0200 |
| commit | f09a37a8d5af37c9d7a450a7206ea57709b81db0 (patch) | |
| tree | df20f02cc64773734086449546ebee063d8ce8ea | |
| parent | ffbaf715502f9e8af0a207d52b9c2274a4d930d8 (diff) | |
Fixes crash if Vulkan presentation surface is not available.
| -rw-r--r-- | drivers/vulkan/vulkan_context.cpp | 3 | ||||
| -rw-r--r-- | platform/linuxbsd/display_server_x11.cpp | 4 |
2 files changed, 6 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; diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp index e04dde7969..bb8086d3a3 100644 --- a/platform/linuxbsd/display_server_x11.cpp +++ b/platform/linuxbsd/display_server_x11.cpp @@ -3852,6 +3852,10 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode (screen_get_size(0).width - p_resolution.width) / 2, (screen_get_size(0).height - p_resolution.height) / 2); WindowID main_window = _create_window(p_mode, p_flags, Rect2i(window_position, p_resolution)); + if (main_window == INVALID_WINDOW_ID) { + r_error = ERR_CANT_CREATE; + return; + } for (int i = 0; i < WINDOW_FLAG_MAX; i++) { if (p_flags & (1 << i)) { window_set_flag(WindowFlags(i), true, main_window); |