godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-30 18:30:54 +00:00
Code Releases Wiki Activity

Fix OpenXR build failure when GLTF module is disabled

Browse Source 
Wrap OpenXR render model classes with MODULE_GLTF_ENABLED guards since
they depend on the GLTF module. Include modules_enabled.gen.h
unconditionally to ensure proper module detection across all build
configurations.
This commit is contained in:
Mrfanta-stick
2025-12-12 18:01:54 +05:30
committed by A Thousand Ships
parent dec5a373d9
commit 70727f46fd
8 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openxr/extensions/openxr_render_model_extension.cpp
View File

@@ -30,6 +30,7 @@
#include "openxr_render_model_extension.h"
#ifdef MODULE_GLTF_ENABLED
#include "../openxr_api.h"
#include "../openxr_interface.h"
@@ -792,3 +793,4 @@ OpenXRRenderModelData::OpenXRRenderModelData() {
OpenXRRenderModelData::~OpenXRRenderModelData() {
}
#endif // MODULE_GLTF_ENABLED

4
modules/openxr/extensions/openxr_render_model_extension.h
View File

@@ -30,6 +30,9 @@
#pragma once
#include "modules/modules_enabled.gen.h"
#ifdef MODULE_GLTF_ENABLED
#include "../openxr_uuid.h"
#include "../util.h"
#include "core/templates/rid_owner.h"
@@ -166,3 +169,4 @@ private:
EXT_PROTO_XRRESULT_FUNC1(xrDestroySpace, (XrSpace), space);
EXT_PROTO_XRRESULT_FUNC5(xrPathToString, (XrInstance), instance, (XrPath), path, (uint32_t), bufferCapacityInput, (uint32_t *), bufferCountOutput, (char *), buffer);
};
#endif // MODULE_GLTF_ENABLED

12
modules/openxr/register_types.cpp
View File

@@ -30,6 +30,8 @@
#include "register_types.h"
#include "modules/modules_enabled.gen.h"
#include "action_map/openxr_action.h"
#include "action_map/openxr_action_map.h"
#include "action_map/openxr_action_set.h"
@@ -48,8 +50,10 @@
#include "scene/openxr_composition_layer_cylinder.h"
#include "scene/openxr_composition_layer_equirect.h"
#include "scene/openxr_composition_layer_quad.h"
#ifdef MODULE_GLTF_ENABLED
#include "scene/openxr_render_model.h"
#include "scene/openxr_render_model_manager.h"
#endif
#include "scene/openxr_visibility_mask.h"
#include "extensions/openxr_android_thread_settings_extension.h"
@@ -73,7 +77,9 @@
#include "extensions/openxr_palm_pose_extension.h"
#include "extensions/openxr_performance_settings_extension.h"
#include "extensions/openxr_pico_controller_extension.h"
#ifdef MODULE_GLTF_ENABLED
#include "extensions/openxr_render_model_extension.h"
#endif
#include "extensions/openxr_valve_analog_threshold_extension.h"
#include "extensions/openxr_visibility_mask_extension.h"
#include "extensions/openxr_wmr_controller_extension.h"
@@ -131,7 +137,9 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
GDREGISTER_CLASS(OpenXRFrameSynthesisExtension);
GDREGISTER_CLASS(OpenXRFutureExtension);
GDREGISTER_CLASS(OpenXRAPIExtension);
#ifdef MODULE_GLTF_ENABLED
GDREGISTER_CLASS(OpenXRRenderModelExtension);
#endif
GDREGISTER_CLASS(OpenXRAndroidThreadSettingsExtension);
// Note, we're not registering all wrapper classes here, there is no point in exposing them
@@ -171,9 +179,11 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
Engine::get_singleton()->add_singleton(Engine::Singleton("OpenXRFutureExtension", future_extension));
// Register render model extension as a singleton.
#ifdef MODULE_GLTF_ENABLED
OpenXRRenderModelExtension *render_model_extension = memnew(OpenXRRenderModelExtension);
OpenXRAPI::register_extension_wrapper(render_model_extension);
Engine::get_singleton()->add_singleton(Engine::Singleton("OpenXRRenderModelExtension", render_model_extension));
#endif
// Register spatial entity extensions
OpenXRSpatialEntityExtension *spatial_entity_extension = memnew(OpenXRSpatialEntityExtension);
@@ -277,8 +287,10 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
#endif
GDREGISTER_CLASS(OpenXRVisibilityMask);
#ifdef MODULE_GLTF_ENABLED
GDREGISTER_CLASS(OpenXRRenderModel);
GDREGISTER_CLASS(OpenXRRenderModelManager);
#endif
GDREGISTER_CLASS(OpenXRSpatialEntityExtension);
GDREGISTER_VIRTUAL_CLASS(OpenXRSpatialEntityTracker);

3
modules/openxr/scene/openxr_render_model.cpp
View File

@@ -30,6 +30,8 @@
#include "openxr_render_model.h"
#ifdef MODULE_GLTF_ENABLED
#include "../extensions/openxr_render_model_extension.h"
#include "core/config/project_settings.h"
#include "scene/3d/mesh_instance_3d.h"
@@ -166,3 +168,4 @@ void OpenXRRenderModel::set_render_model(RID p_render_model) {
_load_render_model_scene();
}
}
#endif // MODULE_GLTF_ENABLED

4
modules/openxr/scene/openxr_render_model.h
View File

@@ -30,6 +30,9 @@
#pragma once
#include "modules/modules_enabled.gen.h"
#ifdef MODULE_GLTF_ENABLED
#include "scene/3d/node_3d.h"
#include <openxr/openxr.h>
@@ -58,3 +61,4 @@ public:
String get_top_level_path() const;
};
#endif // MODULE_GLTF_ENABLED

3
modules/openxr/scene/openxr_render_model_manager.cpp
View File

@@ -30,7 +30,9 @@
#include "openxr_render_model_manager.h"
#ifdef MODULE_GLTF_ENABLED
#include "../extensions/openxr_render_model_extension.h"
#include "../openxr_api.h"
#include "core/config/project_settings.h"
#include "scene/3d/xr/xr_nodes.h"
@@ -282,3 +284,4 @@ void OpenXRRenderModelManager::set_make_local_to_pose(const String &p_action) {
String OpenXRRenderModelManager::get_make_local_to_pose() const {
return make_local_to_pose;
}
#endif // MODULE_GLTF_ENABLED

4
modules/openxr/scene/openxr_render_model_manager.h
View File

@@ -30,6 +30,9 @@
#pragma once
#include "modules/modules_enabled.gen.h"
#ifdef MODULE_GLTF_ENABLED
#include "openxr_render_model.h"
#include "scene/3d/node_3d.h"
@@ -82,3 +85,4 @@ protected:
};
VARIANT_ENUM_CAST(OpenXRRenderModelManager::RenderModelTracker);
#endif // MODULE_GLTF_ENABLED