asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #55325 from Calinou/fsr-use-warn-print

Browse source
This commit is contained in:
Rémi Verschelde 2021-11-26 00:14:23 +01:00 committed by GitHub
commit a5f878d884
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/rendering/renderer_viewport.cpp
View file

@ -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)) { if ((scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR) && (scaling_3d_scale > 1.0)) {
// FSR is not design for downsampling. // FSR is not design for downsampling.
// Throw a warning and fallback to VIEWPORT_SCALING_3D_MODE_BILINEAR // 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; scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
} }
if ((scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR) && !p_viewport->fsr_enabled) { if ((scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_FSR) && !p_viewport->fsr_enabled) {
// FSR is not actually available. // FSR is not actually available.
// Throw a warning and fallback to disable scaling // 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; scaling_enabled = false;
} }
@ -123,7 +123,7 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
break; break;
default: default:
// This is an unknown mode. // 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; width = p_viewport->size.width;
height = p_viewport->size.height; height = p_viewport->size.height;
render_width = width; render_width = width;