Skip to content

Commit d3285f5

Browse files
RepiteoRepiteo
committed
Merge pull request #111185 from WhalesState/vp-disable-xr
More XR disable for Viewport and export.
2 parents c6df8d3 + 9894256 commit d3285f5

File tree

9 files changed

+30
-0
lines changed

9 files changed

+30
-0
lines changed

‎editor/export/shader_baker_export_plugin.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,13 @@ bool ShaderBakerExportPlugin::_begin_customize_resources(const Ref<EditorExportP
125125
customization_configuration_hash = to_hash.as_string().hash64();
126126

127127
BitField<RenderingShaderLibrary::FeatureBits> renderer_features = {};
128+
#ifndef XR_DISABLED
128129
bool xr_enabled = GLOBAL_GET("xr/shaders/enabled");
129130
renderer_features.set_flag(RenderingShaderLibrary::FEATURE_ADVANCED_BIT);
130131
if (xr_enabled) {
131132
renderer_features.set_flag(RenderingShaderLibrary::FEATURE_MULTIVIEW_BIT);
132133
}
134+
#endif // XR_DISABLED
133135

134136
int vrs_mode = GLOBAL_GET("rendering/vrs/mode");
135137
if (vrs_mode != 0) {

‎platform/android/export/export_plugin.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2177,7 +2177,9 @@ void EditorExportPlatformAndroid::get_export_options(List<ExportOption> *r_optio
21772177

21782178
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "shader_baker/enabled"), false));
21792179

2180+
#ifndef XR_DISABLED
21802181
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "xr_features/xr_mode", PROPERTY_HINT_ENUM, "Regular,OpenXR"), XR_MODE_REGULAR, false, true));
2182+
#endif // XR_DISABLED
21812183

21822184
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "gesture/swipe_to_dismiss"), false));
21832185

@@ -3087,6 +3089,7 @@ void EditorExportPlatformAndroid::get_command_line_flags(const Ref<EditorExportP
30873089
command_line_strings.push_back(apk_expansion_public_key.strip_edges());
30883090
}
30893091

3092+
#ifndef XR_DISABLED
30903093
int xr_mode_index = p_preset->get("xr_features/xr_mode");
30913094
if (xr_mode_index == XR_MODE_OPENXR) {
30923095
command_line_strings.push_back("--xr_mode_openxr");
@@ -3100,6 +3103,7 @@ void EditorExportPlatformAndroid::get_command_line_flags(const Ref<EditorExportP
31003103
command_line_strings.push_back("--xr-mode");
31013104
command_line_strings.push_back("off");
31023105
}
3106+
#endif // XR_DISABLED
31033107

31043108
bool immersive = p_preset->get("screen/immersive_mode");
31053109
if (immersive) {

‎scene/main/viewport.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4768,6 +4768,7 @@ void Viewport::_propagate_exit_world_3d(Node *p_node) {
47684768
}
47694769
}
47704770

4771+
#ifndef XR_DISABLED
47714772
void Viewport::set_use_xr(bool p_use_xr) {
47724773
ERR_MAIN_THREAD_GUARD;
47734774
if (use_xr != p_use_xr) {
@@ -4794,6 +4795,7 @@ bool Viewport::is_using_xr() {
47944795
ERR_READ_THREAD_GUARD_V(false);
47954796
return use_xr;
47964797
}
4798+
#endif // XR_DISABLED
47974799

47984800
void Viewport::set_scaling_3d_mode(Scaling3DMode p_scaling_3d_mode) {
47994801
ERR_MAIN_THREAD_GUARD;
@@ -5060,8 +5062,10 @@ void Viewport::_bind_methods() {
50605062
ClassDB::bind_method(D_METHOD("set_disable_3d", "disable"), &Viewport::set_disable_3d);
50615063
ClassDB::bind_method(D_METHOD("is_3d_disabled"), &Viewport::is_3d_disabled);
50625064

5065+
#ifndef XR_DISABLED
50635066
ClassDB::bind_method(D_METHOD("set_use_xr", "use"), &Viewport::set_use_xr);
50645067
ClassDB::bind_method(D_METHOD("is_using_xr"), &Viewport::is_using_xr);
5068+
#endif // XR_DISABLED
50655069

50665070
ClassDB::bind_method(D_METHOD("set_scaling_3d_mode", "scaling_3d_mode"), &Viewport::set_scaling_3d_mode);
50675071
ClassDB::bind_method(D_METHOD("get_scaling_3d_mode"), &Viewport::get_scaling_3d_mode);
@@ -5088,7 +5092,9 @@ void Viewport::_bind_methods() {
50885092
ClassDB::bind_method(D_METHOD("get_vrs_texture"), &Viewport::get_vrs_texture);
50895093

50905094
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disable_3d"), "set_disable_3d", "is_3d_disabled");
5095+
#ifndef XR_DISABLED
50915096
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_xr"), "set_use_xr", "is_using_xr");
5097+
#endif // XR_DISABLED
50925098
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "own_world_3d"), "set_use_own_world_3d", "is_using_own_world_3d");
50935099
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "world_3d", PROPERTY_HINT_RESOURCE_TYPE, "World3D"), "set_world_3d", "get_world_3d");
50945100
#endif // _3D_DISABLED

‎scene/main/viewport.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,9 @@ class Viewport : public Node {
788788
#ifndef _3D_DISABLED
789789
private:
790790
// 3D audio, camera, physics, and world.
791+
#ifndef XR_DISABLED
791792
bool use_xr = false;
793+
#endif // XR_DISABLED
792794
friend class AudioListener3D;
793795
AudioListener3D *audio_listener_3d = nullptr;
794796
HashSet<AudioListener3D *> audio_listener_3d_set;
@@ -846,8 +848,10 @@ class Viewport : public Node {
846848
void set_use_own_world_3d(bool p_use_own_world_3d);
847849
bool is_using_own_world_3d() const;
848850

851+
#ifndef XR_DISABLED
849852
void set_use_xr(bool p_use_xr);
850853
bool is_using_xr();
854+
#endif // XR_DISABLED
851855
#endif // _3D_DISABLED
852856

853857
Viewport();

‎servers/rendering/renderer_viewport.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@ void RendererViewport::viewport_initialize(RID p_rid) {
955955
viewport->fsr_enabled = !RSG::rasterizer->is_low_end() && !viewport->disable_3d;
956956
}
957957

958+
#ifndef XR_DISABLED
958959
void RendererViewport::viewport_set_use_xr(RID p_viewport, bool p_use_xr) {
959960
Viewport *viewport = viewport_owner.get_or_null(p_viewport);
960961
ERR_FAIL_NULL(viewport);
@@ -972,6 +973,7 @@ void RendererViewport::viewport_set_use_xr(RID p_viewport, bool p_use_xr) {
972973
_configure_3d_render_buffers(viewport);
973974
}
974975
}
976+
#endif // !XR_DISABLED
975977

976978
void RendererViewport::viewport_set_scaling_3d_mode(RID p_viewport, RS::ViewportScaling3DMode p_mode) {
977979
Viewport *viewport = viewport_owner.get_or_null(p_viewport);

‎servers/rendering/renderer_viewport.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,9 @@ class RendererViewport {
216216
RID viewport_allocate();
217217
void viewport_initialize(RID p_rid);
218218

219+
#ifndef XR_DISABLED
219220
void viewport_set_use_xr(RID p_viewport, bool p_use_xr);
221+
#endif // XR_DISABLED
220222

221223
void viewport_set_size(RID p_viewport, int p_width, int p_height);
222224

‎servers/rendering/rendering_server.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2823,7 +2823,9 @@ void RenderingServer::_bind_methods() {
28232823
/* VIEWPORT */
28242824

28252825
ClassDB::bind_method(D_METHOD("viewport_create"), &RenderingServer::viewport_create);
2826+
#ifndef XR_DISABLED
28262827
ClassDB::bind_method(D_METHOD("viewport_set_use_xr", "viewport", "use_xr"), &RenderingServer::viewport_set_use_xr);
2828+
#endif // XR_DISABLED
28272829
ClassDB::bind_method(D_METHOD("viewport_set_size", "viewport", "width", "height"), &RenderingServer::viewport_set_size);
28282830
ClassDB::bind_method(D_METHOD("viewport_set_active", "viewport", "active"), &RenderingServer::viewport_set_active);
28292831
ClassDB::bind_method(D_METHOD("viewport_set_parent_viewport", "viewport", "parent_viewport"), &RenderingServer::viewport_set_parent_viewport);
@@ -3760,7 +3762,9 @@ void RenderingServer::init() {
37603762
GLOBAL_DEF_RST(PropertyInfo(Variant::INT, "rendering/limits/opengl/max_renderable_lights", PROPERTY_HINT_RANGE, "2,256,1"), 32);
37613763
GLOBAL_DEF_RST(PropertyInfo(Variant::INT, "rendering/limits/opengl/max_lights_per_object", PROPERTY_HINT_RANGE, "2,1024,1"), 8);
37623764

3765+
#ifndef XR_DISABLED
37633766
GLOBAL_DEF_RST_BASIC("xr/shaders/enabled", false);
3767+
#endif // XR_DISABLED
37643768

37653769
GLOBAL_DEF("debug/shader_language/warnings/enable", true);
37663770
GLOBAL_DEF("debug/shader_language/warnings/treat_warnings_as_errors", false);

‎servers/rendering/rendering_server.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,10 @@ class RenderingServer : public Object {
980980
return VIEWPORT_SCALING_3D_TYPE_NONE;
981981
}
982982

983+
#ifndef XR_DISABLED
983984
virtual void viewport_set_use_xr(RID p_viewport, bool p_use_xr) = 0;
985+
#endif // !XR_DISABLED
986+
984987
virtual void viewport_set_size(RID p_viewport, int p_width, int p_height) = 0;
985988
virtual void viewport_set_active(RID p_viewport, bool p_active) = 0;
986989
virtual void viewport_set_parent_viewport(RID p_viewport, RID p_parent_viewport) = 0;

‎servers/rendering/rendering_server_default.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,10 @@ class RenderingServerDefault : public RenderingServer {
693693

694694
FUNCRIDSPLIT(viewport)
695695

696+
#ifndef XR_DISABLED
696697
FUNC2(viewport_set_use_xr, RID, bool)
698+
#endif // XR_DISABLED
699+
697700
FUNC3(viewport_set_size, RID, int, int)
698701

699702
FUNC2(viewport_set_active, RID, bool)

0 commit comments

Comments
 (0)