Merge pull request #103338 from dsnopek/openxr-passthrough-emulation-wins

akien-mga · akien-mga · commit dd43d401ecb1 · 2025-02-27T12:40:36.000+01:00
OpenXR: Emulated alpha blend mode should override the real blend mode
diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp
@@ -3641,10 +3641,10 @@ void OpenXRAPI::set_emulate_environment_blend_mode_alpha_blend(bool p_enabled) {
 }
 
 OpenXRAPI::OpenXRAlphaBlendModeSupport OpenXRAPI::is_environment_blend_mode_alpha_blend_supported() {
-	if (is_environment_blend_mode_supported(XR_ENVIRONMENT_BLEND_MODE_ALPHA_BLEND)) {
-		return OPENXR_ALPHA_BLEND_MODE_SUPPORT_REAL;
-	} else if (emulate_environment_blend_mode_alpha_blend) {
+	if (emulate_environment_blend_mode_alpha_blend) {
 		return OPENXR_ALPHA_BLEND_MODE_SUPPORT_EMULATING;
+	} else if (is_environment_blend_mode_supported(XR_ENVIRONMENT_BLEND_MODE_ALPHA_BLEND)) {
+		return OPENXR_ALPHA_BLEND_MODE_SUPPORT_REAL;
 	}
 	return OPENXR_ALPHA_BLEND_MODE_SUPPORT_NONE;
 }

Original file line number	Diff line number	Diff line change
`@@ -3641,10 +3641,10 @@ void OpenXRAPI::set_emulate_environment_blend_mode_alpha_blend(bool p_enabled) {`
`3641`	`3641`	`}`
`3642`	`3642`
`3643`	`3643`	`OpenXRAPI::OpenXRAlphaBlendModeSupport OpenXRAPI::is_environment_blend_mode_alpha_blend_supported() {`
`3644`		`- if (is_environment_blend_mode_supported(XR_ENVIRONMENT_BLEND_MODE_ALPHA_BLEND)) {`
`3645`		`- return OPENXR_ALPHA_BLEND_MODE_SUPPORT_REAL;`
`3646`		`- } else if (emulate_environment_blend_mode_alpha_blend) {`
	`3644`	`+ if (emulate_environment_blend_mode_alpha_blend) {`
`3647`	`3645`	`return OPENXR_ALPHA_BLEND_MODE_SUPPORT_EMULATING;`
	`3646`	`+ } else if (is_environment_blend_mode_supported(XR_ENVIRONMENT_BLEND_MODE_ALPHA_BLEND)) {`
	`3647`	`+ return OPENXR_ALPHA_BLEND_MODE_SUPPORT_REAL;`
`3648`	`3648`	`}`
`3649`	`3649`	`return OPENXR_ALPHA_BLEND_MODE_SUPPORT_NONE;`
`3650`	`3650`	`}`