Merge pull request godotengine#110672 from Kaleb-Reid/fallback-scaling-type

Repiteo · Repiteo · commit 9f4f16c58831 · 2025-10-06T09:06:39.000-05:00
Use correct scaling type when falling back to bilinear
diff --git a/servers/rendering/renderer_viewport.cpp b/servers/rendering/renderer_viewport.cpp
@@ -192,13 +192,15 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 				// Fall back to bilinear scaling.
 				WARN_PRINT_ONCE("FSR 3D resolution scaling is not designed for downsampling. Falling back to bilinear 3D resolution scaling.");
 				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
+				scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);
 			}
 
 			if (scaling_3d_is_not_bilinear && !upscaler_available) {
 				// FSR is not actually available.
 				// Fall back to bilinear scaling.
 				WARN_PRINT_ONCE("FSR 3D resolution scaling is not available. Falling back to bilinear 3D resolution scaling.");
 				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
+				scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);
 			}
 
 			if (use_taa && (scaling_type == RS::VIEWPORT_SCALING_3D_TYPE_TEMPORAL)) {

Original file line number	Diff line number	Diff line change
`@@ -192,13 +192,15 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {`
`192`	`192`	`// Fall back to bilinear scaling.`
`193`	`193`	`WARN_PRINT_ONCE("FSR 3D resolution scaling is not designed for downsampling. Falling back to bilinear 3D resolution scaling.");`
`194`	`194`	`scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;`
	`195`	`+ scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);`
`195`	`196`	`}`
`196`	`197`
`197`	`198`	`if (scaling_3d_is_not_bilinear && !upscaler_available) {`
`198`	`199`	`// FSR is not actually available.`
`199`	`200`	`// Fall back to bilinear scaling.`
`200`	`201`	`WARN_PRINT_ONCE("FSR 3D resolution scaling is not available. Falling back to bilinear 3D resolution scaling.");`
`201`	`202`	`scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;`
	`203`	`+ scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);`
`202`	`204`	`}`
`203`	`205`
`204`	`206`	`if (use_taa && (scaling_type == RS::VIEWPORT_SCALING_3D_TYPE_TEMPORAL)) {`