Update switch statements to prevent build warnings

GodotVR · Sep 19, 2024 · d2d541b · d2d541b
1 parent cdedfcb
commit d2d541b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 24 deletions.
diff --git a/plugin/src/main/cpp/extensions/openxr_fb_composition_layer_settings_extension_wrapper.cpp b/plugin/src/main/cpp/extensions/openxr_fb_composition_layer_settings_extension_wrapper.cpp
@@ -113,22 +113,18 @@ uint64_t OpenXRFbCompositionLayerSettingsExtensionWrapper::_set_viewport_composi
 		return reinterpret_cast<uint64_t>(settings);
 	}
 
-	switch ((SupersamplingMode)(int)p_property_values.get(SUPERSAMPLING_MODE_PROPERTY_NAME, SUPERSAMPLING_MODE_DISABLED)) {
-		case SUPERSAMPLING_MODE_NORMAL: {
-			settings->layerFlags |= XR_COMPOSITION_LAYER_SETTINGS_NORMAL_SUPER_SAMPLING_BIT_FB;
-		} break;
-		case SUPERSAMPLING_MODE_QUALITY: {
-			settings->layerFlags |= XR_COMPOSITION_LAYER_SETTINGS_QUALITY_SUPER_SAMPLING_BIT_FB;
-		} break;
+	SupersamplingMode supersampling_mode = (SupersamplingMode)(int)p_property_values.get(SUPERSAMPLING_MODE_PROPERTY_NAME, SUPERSAMPLING_MODE_DISABLED);
+	if (supersampling_mode == SUPERSAMPLING_MODE_NORMAL) {
+		settings->layerFlags |= XR_COMPOSITION_LAYER_SETTINGS_NORMAL_SUPER_SAMPLING_BIT_FB;
+	} else if (supersampling_mode == SUPERSAMPLING_MODE_QUALITY) {
+		settings->layerFlags |= XR_COMPOSITION_LAYER_SETTINGS_QUALITY_SUPER_SAMPLING_BIT_FB;
 	}
 
-	switch ((SharpeningMode)(int)p_property_values.get(SHARPENING_MODE_PROPERTY_NAME, SHARPENING_MODE_DISABLED)) {
-		case SHARPENING_MODE_NORMAL: {
-			settings->layerFlags |= XR_COMPOSITION_LAYER_SETTINGS_NORMAL_SHARPENING_BIT_FB;
-		} break;
-		case SHARPENING_MODE_QUALITY: {
-			settings->layerFlags |= XR_COMPOSITION_LAYER_SETTINGS_QUALITY_SHARPENING_BIT_FB;
-		} break;
+	SharpeningMode sharpening_mode = (SharpeningMode)(int)p_property_values.get(SHARPENING_MODE_PROPERTY_NAME, SHARPENING_MODE_DISABLED);
+	if (sharpening_mode == SHARPENING_MODE_NORMAL) {
+		settings->layerFlags |= XR_COMPOSITION_LAYER_SETTINGS_NORMAL_SHARPENING_BIT_FB;
+	} else if (sharpening_mode == SHARPENING_MODE_QUALITY) {
+		settings->layerFlags |= XR_COMPOSITION_LAYER_SETTINGS_QUALITY_SHARPENING_BIT_FB;
 	}
 
 	if (settings->layerFlags == 0) {

diff --git a/plugin/src/main/cpp/extensions/openxr_fb_passthrough_extension_wrapper.cpp b/plugin/src/main/cpp/extensions/openxr_fb_passthrough_extension_wrapper.cpp
@@ -302,16 +302,13 @@ void OpenXRFbPassthroughExtensionWrapper::start_passthrough() {
 
 void OpenXRFbPassthroughExtensionWrapper::start_passthrough_layer(LayerPurpose p_layer_purpose) {
 	XrPassthroughLayerPurposeFB xr_layer_purpose;
-	switch (p_layer_purpose) {
-		case LAYER_PURPOSE_RECONSTRUCTION:
-			xr_layer_purpose = XR_PASSTHROUGH_LAYER_PURPOSE_RECONSTRUCTION_FB;
-			break;
-		case LAYER_PURPOSE_PROJECTED:
-			xr_layer_purpose = XR_PASSTHROUGH_LAYER_PURPOSE_PROJECTED_FB;
-			break;
-		default:
-			UtilityFunctions::print("Corresponding XrPassthroughLayerPurposeFB not found for LayerPurpose: ", p_layer_purpose);
-			return;
+	if (p_layer_purpose == LAYER_PURPOSE_RECONSTRUCTION) {
+		xr_layer_purpose = XR_PASSTHROUGH_LAYER_PURPOSE_RECONSTRUCTION_FB;
+	} else if (p_layer_purpose == LAYER_PURPOSE_PROJECTED) {
+		xr_layer_purpose = XR_PASSTHROUGH_LAYER_PURPOSE_PROJECTED_FB;
+	} else {
+		UtilityFunctions::print("Corresponding XrPassthroughLayerPurposeFB not found for LayerPurpose: ", p_layer_purpose);
+		return;
 	}
 
 	// If passthrough hasn't started, start it.