summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-10-04 15:36:22 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-10-04 15:36:22 +0200
commit146d87c230d3e9b788f508c95601ae45fdb19f14 (patch)
tree3a305eab17ec5bc9c9cc1b79e611cb77b43d420d
parentd92c02002f9b8568cc0be5b3673459a1af52b250 (diff)
parent1d34033143fcc4b520b7b2296f1847a92a0e41de (diff)
downloadredot-engine-146d87c230d3e9b788f508c95601ae45fdb19f14.tar.gz
Merge pull request #82679 from lyuma/workaround_xr_off_crash
Workaround crash due to null shader when running XR project with `--xr-mode` off
-rw-r--r--drivers/vulkan/rendering_device_vulkan.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp
index 11321b2121..e553b2b522 100644
--- a/drivers/vulkan/rendering_device_vulkan.cpp
+++ b/drivers/vulkan/rendering_device_vulkan.cpp
@@ -5054,6 +5054,7 @@ RID RenderingDeviceVulkan::shader_create_from_bytecode(const Vector<uint8_t> &p_
}
Shader *shader = shader_owner.get_or_null(id);
+ ERR_FAIL_NULL_V(shader, RID());
shader->vertex_input_mask = vertex_input_mask;
shader->fragment_output_mask = fragment_output_mask;