From 079ae6a03f3b7d806ac3793dea4838c0e71d6644 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Thu, 25 Nov 2021 22:47:11 +0100 Subject: [PATCH] Use `WARN_PRINT_ONCE()` for FSR-related warning messages `print_error()` should generally not be used directly. Also, falling back is best done by printing a warning message instead of an error message. --- servers/rendering/renderer_viewport.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/rendering/renderer_viewport.cpp b/servers/rendering/renderer_viewport.cpp index 8a148345690..eddf5bf53d5 100644 --- a/servers/rendering/renderer_viewport.cpp +++ b/servers/rendering/renderer_viewport.cpp @@ -85,14 +85,14 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) { if ((scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR) && (scaling_3d_scale > 1.0)) { // FSR is not design for downsampling. // Throw a warning and fallback to VIEWPORT_SCALING_3D_MODE_BILINEAR - print_error("FSR does not support supersampling. Falling back to bilinear mode."); + WARN_PRINT_ONCE("FSR 3D resolution scaling does not support supersampling. Falling back to bilinear scaling."); scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR; } if ((scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR) && !p_viewport->fsr_enabled) { // FSR is not actually available. // Throw a warning and fallback to disable scaling - print_error("FSR is not available. Disabled FSR scaling 3D. Try bilinear mode."); + WARN_PRINT_ONCE("FSR 3D resolution scaling is not available. Disabling 3D resolution scaling."); scaling_enabled = false; } @@ -123,7 +123,7 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) { break; default: // This is an unknown mode. - print_error(vformat("Unknown scaling mode: %d, disabling scaling 3D", scaling_3d_mode)); + WARN_PRINT_ONCE(vformat("Unknown scaling mode: %d. Disabling 3D resolution scaling.", scaling_3d_mode)); width = p_viewport->size.width; height = p_viewport->size.height; render_width = width;