diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-12 23:12:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 23:12:03 +0200 |
| commit | 9cf9054c3e5e87e8753fa1b08fd71b438a4db308 (patch) | |
| tree | 47b1e0ae6a5b410c39df96244bdfc50ed01e32a1 | |
| parent | f263e3ac8147b5713c10f139f2abc465463cf2ec (diff) | |
| parent | 0cdd7d88ad7d8a0b4050abf8c87a4413bb885206 (diff) | |
Merge pull request #60976 from Calinou/fsr-rename-property-hint
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_scene_render_rd.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering_server.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp index 9f780013bd..21b1b45802 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp @@ -2593,7 +2593,7 @@ void RendererSceneRenderRD::_render_buffers_post_process_and_tonemap(const Rende } if (can_use_effects && can_use_storage && (rb->internal_width != rb->width || rb->internal_height != rb->height)) { - RD::get_singleton()->draw_command_begin_label("FSR Upscale"); + RD::get_singleton()->draw_command_begin_label("FSR 1.0 Upscale"); storage->get_effects()->fsr_upscale(rb->internal_texture, rb->upscale_texture, rb->texture, Size2i(rb->internal_width, rb->internal_height), Size2i(rb->width, rb->height), rb->fsr_sharpness); diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index c4aafcc22c..fc40f058aa 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -2934,7 +2934,7 @@ RenderingServer::RenderingServer() { ProjectSettings::get_singleton()->set_custom_property_info("rendering/scaling_3d/mode", PropertyInfo(Variant::INT, "rendering/scaling_3d/mode", - PROPERTY_HINT_ENUM, "Bilinear (Fastest),FSR (Fast)")); + PROPERTY_HINT_ENUM, "Bilinear (Fastest),FSR 1.0 (Fast)")); ProjectSettings::get_singleton()->set_custom_property_info("rendering/scaling_3d/scale", PropertyInfo(Variant::FLOAT, |