Skip to content

Commit

Permalink
Updated docs
Browse files Browse the repository at this point in the history
Used clang-format on unformatted files
  • Loading branch information
Je06jm authored and Chaosus committed Aug 15, 2021
1 parent 34488b4 commit 7496cc7
Show file tree
Hide file tree
Showing 11 changed files with 5,359 additions and 2,929 deletions.
4 changes: 4 additions & 0 deletions doc/classes/ProjectSettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,10 @@
</member>
<member name="rendering/vulkan/rendering/back_end.mobile" type="int" setter="" getter="" default="1">
</member>
<member name="rendering/vulkan/rendering/fsr_upscale_quality" type="int" setter="" getter="" default="0">
</member>
<member name="rendering/vulkan/rendering/fsr_upscale_sharpness" type="float" setter="" getter="" default="0.2">
</member>
<member name="rendering/vulkan/staging_buffer/block_size_kb" type="int" setter="" getter="" default="256">
</member>
<member name="rendering/vulkan/staging_buffer/max_size_mb" type="int" setter="" getter="" default="128">
Expand Down
7 changes: 7 additions & 0 deletions doc/classes/RenderingServer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3031,6 +3031,13 @@
If [code]true[/code], rendering of a viewport's environment is disabled.
</description>
</method>
<method name="viewport_set_fsr_upscale_quality">
<return type="void" />
<argument index="0" name="viewport" type="RID" />
<argument index="1" name="quality_mode" type="int" enum="RenderingServer.ViewportFSRUpscaleQualityMode" />
<description>
</description>
</method>
<method name="viewport_set_global_canvas_transform">
<return type="void" />
<argument index="0" name="viewport" type="RID" />
Expand Down
12 changes: 6 additions & 6 deletions doc/classes/Viewport.xml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@
<member name="disable_3d" type="bool" setter="set_disable_3d" getter="is_3d_disabled" default="false">
Disable 3D rendering (but keep 2D rendering).
</member>
<member name="fsr_upscale_quality" type="int" setter="set_fsr_upscale_quality" getter="get_fsr_upscale_quality" enum="Viewport.FSRUpscaleQuality" default="0">
Sets the FidelityFX Super Resolution 1.0 quality. FidelityFX Super Resolution 1.0 is an upscaling technology that produces high quality images at fast framerates.
</member>
<member name="fsr_upscale_sharpness" type="float" setter="set_fsr_upscale_sharpness" getter="get_fsr_upscale_sharpness" default="0.2">
Determins how sharp the upscaled image should be. Sharpness halves with every whole number. Values go from 0.0 (sharpest) to 2.0. Values above 2.0 won't make a visible difference.
</member>
<member name="global_canvas_transform" type="Transform2D" setter="set_global_canvas_transform" getter="get_global_canvas_transform">
The global canvas transform of the viewport. The canvas transform is relative to this.
</member>
Expand Down Expand Up @@ -214,12 +220,6 @@
<member name="screen_space_aa" type="int" setter="set_screen_space_aa" getter="get_screen_space_aa" enum="Viewport.ScreenSpaceAA" default="0">
Sets the screen-space antialiasing method used. Screen-space antialiasing works by selectively blurring edges in a post-process shader. It differs from MSAA which takes multiple coverage samples while rendering objects. Screen-space AA methods are typically faster than MSAA and will smooth out specular aliasing, but tend to make scenes appear blurry.
</member>
<member name="fsr_upscale_quality" type="int" setter="set_fsr_upscale_quality" getter="get_fsr_upscale_quality" enum="Viewport.FSRUpscaleQuality" default="0">
Sets the FidelityFX Super Resolution 1.0 quality. FidelityFX Super Resolution 1.0 is an upscaling technology that produces high quality images at fast framerates.
</member>
<member name="fsr_upscale_sharpness" type="float" setter="set_fsr_upscale_sharpness" getter="get_fsr_upscale_sharpness" default="0.2">
Determins how sharp the upscaled image should be. Sharpness halves with every whole number. Values go from 0.0 (sharpest) to 2.0. Values above 2.0 won't make a visible difference.
</member>
<member name="sdf_oversize" type="int" setter="set_sdf_oversize" getter="get_sdf_oversize" enum="Viewport.SDFOversize" default="1">
</member>
<member name="sdf_scale" type="int" setter="set_sdf_scale" getter="get_sdf_scale" enum="Viewport.SDFScale" default="1">
Expand Down
2 changes: 1 addition & 1 deletion editor/project_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ class ProjectDialog : public ConfirmationDialog {
initial_settings["application/config/name"] = project_name->get_text().strip_edges();
initial_settings["application/config/icon"] = "res://icon.png";
initial_settings["rendering/environment/defaults/default_environment"] = "res://default_env.tres";
initial_settings["application/config/resolution"] = Vector2i {0, 0};
initial_settings["application/config/resolution"] = Vector2i{ 0, 0 };

if (ProjectSettings::get_singleton()->save_custom(dir.plus_file("project.godot"), initial_settings, Vector<String>(), false) != OK) {
set_message(TTR("Couldn't create project.godot in project path."), MESSAGE_ERROR);
Expand Down
3 changes: 1 addition & 2 deletions servers/rendering/renderer_rd/effects_rd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ void EffectsRD::fsr_upscale(RID p_source_rd_texture, RID p_secondary_texture, RI
FSR_upscale.push_constant.upscaled_width = p_size.width;
FSR_upscale.push_constant.upscaled_height = p_size.height;
FSR_upscale.push_constant.sharpness = p_fsr_upscale_sharpness;

//FSR Easc
FSR_upscale.push_constant.pass = FSR_UPSCALE_PASS_EASU;
RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_texture(p_source_rd_texture), 0);
Expand Down Expand Up @@ -1937,7 +1937,6 @@ EffectsRD::EffectsRD(bool p_prefer_raster_effects) {

FSR_upscale.shader_version = FSR_upscale.shader.version_create();
FSR_upscale.pipeline = RD::get_singleton()->compute_pipeline_create(FSR_upscale.shader.version_get_shader(FSR_upscale.shader_version, 0));

}

prefer_raster_effects = p_prefer_raster_effects;
Expand Down
4 changes: 2 additions & 2 deletions servers/rendering/renderer_rd/effects_rd.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

#include "core/math/camera_matrix.h"
#include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
#include "servers/rendering/renderer_rd/shaders/fsr_upscale.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/blur_raster.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/bokeh_dof.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/bokeh_dof_raster.glsl.gen.h"
Expand All @@ -46,6 +45,7 @@
#include "servers/rendering/renderer_rd/shaders/cubemap_filter_raster.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/cubemap_roughness.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/cubemap_roughness_raster.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/fsr_upscale.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/luminance_reduce.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/luminance_reduce_raster.glsl.gen.h"
#include "servers/rendering/renderer_rd/shaders/resolve.glsl.gen.h"
Expand Down Expand Up @@ -775,7 +775,7 @@ class EffectsRD {

public:
bool get_prefer_raster_effects();

void fsr_upscale(RID p_source_rd_texture, RID p_secondary_texture, RID p_destination_texture, const Size2i &p_internal_size, const Size2i &p_size, float p_fsr_upscale_sharpness);
void copy_to_fb_rect(RID p_source_rd_texture, RID p_dest_framebuffer, const Rect2i &p_rect, bool p_flip_y = false, bool p_force_luminance = false, bool p_alpha_to_zero = false, bool p_srgb = false, RID p_secondary = RID());
void copy_to_rect(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, bool p_flip_y = false, bool p_force_luminance = false, bool p_all_source = false, bool p_8_bit_dst = false, bool p_alpha_to_one = false);
Expand Down
Loading

0 comments on commit 7496cc7

Please sign in to comment.