Skip to content

Commit

Permalink
Merge pull request godotengine#60976 from Calinou/fsr-rename-property…
Browse files Browse the repository at this point in the history
…-hint
  • Loading branch information
akien-mga authored May 12, 2022
2 parents f263e3a + 0cdd7d8 commit 9cf9054
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion servers/rendering_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9cf9054

Please sign in to comment.