hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #115254 from BastiaanOlij/openxr_depth_warning

Browse source 
OpenXR: Inability to find depth format now gives a warning
This commit is contained in:
Thaddeus Crews 2026-01-28 17:58:03 -06:00
commit 623bbb3414
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

33
modules/openxr/openxr_api.cpp
View file

@ -1273,7 +1273,7 @@ bool OpenXRAPI::obtain_swapchain_formats() {
print_verbose(String("Using color swap chain format:") + get_swapchain_format_name(color_swapchain_format));
}
{
if (submit_depth_buffer) {
// Build a vector with swapchain formats we want to use, from best fit to worst
Vector<int64_t> usable_swapchain_formats;
depth_swapchain_format = 0;
@ -1287,9 +1287,11 @@ bool OpenXRAPI::obtain_swapchain_formats() {
}
}
ERR_FAIL_COND_V_MSG(depth_swapchain_format == 0, false, "OpenXR: No usable depth swap chain format available!");
print_verbose(String("Using depth swap chain format:") + get_swapchain_format_name(depth_swapchain_format));
if (depth_swapchain_format == 0) {
WARN_PRINT("OpenXR: No usable depth swap chain format available!");
} else {
print_verbose(String("Using depth swap chain format:") + get_swapchain_format_name(depth_swapchain_format));
}
}
return true;
@ -1300,21 +1302,6 @@ bool OpenXRAPI::create_main_swapchains(const Size2i &p_size) {
ERR_FAIL_NULL_V(graphics_extension, false);
ERR_FAIL_COND_V(session == XR_NULL_HANDLE, false);
/*
TODO: We need to improve on this, for now we're taking our old approach of creating our main swapchains and substituting
those for the ones Godot normally creates.
This however means we can only use swapchains for our main XR view.
It would have been nicer if we could override the swapchain creation in Godot with ours but we have a timing issue here.
We can't create XR swapchains until after our XR session is fully instantiated, yet Godot creates its swapchain much earlier.
We only creates a swapchain for the main output here.
Additional swapchains may be created through our composition layer extension.
Finally an area we need to expand upon is that Foveated rendering is only enabled for the swap chain we create,
as we render 3D content into internal buffers that are copied into the swapchain, we do now have (basic) VRS support
*/
render_state.main_swapchain_size = p_size;
uint32_t sample_count = 1;
@ -1330,7 +1317,7 @@ bool OpenXRAPI::create_main_swapchains(const Size2i &p_size) {
// We create our depth swapchain if:
// - we've enabled submitting depth buffer
// - we support our depth layer extension
// - we have our spacewarp extension (not yet implemented)
// Note: Application Space Warp and Frame Synthesis use a separate lower resolution depth buffer.
if (depth_swapchain_format != 0 && submit_depth_buffer && OpenXRCompositionLayerDepthExtension::get_singleton()->is_available()) {
if (!render_state.main_swapchains[OPENXR_SWAPCHAIN_DEPTH].create(0, XR_SWAPCHAIN_USAGE_SAMPLED_BIT | XR_SWAPCHAIN_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, depth_swapchain_format, render_state.main_swapchain_size.width, render_state.main_swapchain_size.height, sample_count, view_configuration_views.size())) {
return false;
@ -1339,12 +1326,6 @@ bool OpenXRAPI::create_main_swapchains(const Size2i &p_size) {
set_object_name(XR_OBJECT_TYPE_SWAPCHAIN, uint64_t(render_state.main_swapchains[OPENXR_SWAPCHAIN_DEPTH].get_swapchain()), "Main depth swapchain");
}
// We create our velocity swapchain if:
// - we have our spacewarp extension (not yet implemented)
{
// TBD
}
for (uint32_t i = 0; i < render_state.views.size(); i++) {
render_state.projection_views[i].subImage.swapchain = render_state.main_swapchains[OPENXR_SWAPCHAIN_COLOR].get_swapchain();
render_state.projection_views[i].subImage.imageArrayIndex = i;