Moved most of the effect code to compute.

Simplifies it and improves performance.
Improves image barrier handling per mipmap on RenderingDeviceVulkan

1 files changed, 73 insertions, 62 deletions

diff --git a/servers/rendering/rasterizer_rd/rasterizer_effects_rd.h b/servers/rendering/rasterizer_rd/rasterizer_effects_rd.h
index c0c62eb0be..64e16a58a6 100644
--- a/servers/rendering/rasterizer_rd/rasterizer_effects_rd.h
+++ b/servers/rendering/rasterizer_rd/rasterizer_effects_rd.h
@@ -33,9 +33,10 @@
 
 #include "core/math/camera_matrix.h"
 #include "servers/rendering/rasterizer_rd/render_pipeline_vertex_format_cache_rd.h"
-#include "servers/rendering/rasterizer_rd/shaders/blur.glsl.gen.h"
 #include "servers/rendering/rasterizer_rd/shaders/bokeh_dof.glsl.gen.h"
 #include "servers/rendering/rasterizer_rd/shaders/copy.glsl.gen.h"
+#include "servers/rendering/rasterizer_rd/shaders/copy_to_fb.glsl.gen.h"
+#include "servers/rendering/rasterizer_rd/shaders/cube_to_dp.glsl.gen.h"
 #include "servers/rendering/rasterizer_rd/shaders/cubemap_downsampler.glsl.gen.h"
 #include "servers/rendering/rasterizer_rd/shaders/cubemap_filter.glsl.gen.h"
 #include "servers/rendering/rasterizer_rd/shaders/cubemap_roughness.glsl.gen.h"
@@ -55,71 +56,78 @@
 
 class RasterizerEffectsRD {
 
-	enum BlurMode {
-		BLUR_MODE_GAUSSIAN_BLUR,
-		BLUR_MODE_GAUSSIAN_GLOW,
-		BLUR_MODE_GAUSSIAN_GLOW_AUTO_EXPOSURE,
-		BLUR_MODE_DOF_NEAR_LOW,
-		BLUR_MODE_DOF_NEAR_MEDIUM,
-		BLUR_MODE_DOF_NEAR_HIGH,
-		BLUR_MODE_DOF_NEAR_MERGE_LOW,
-		BLUR_MODE_DOF_NEAR_MERGE_MEDIUM,
-		BLUR_MODE_DOF_NEAR_MERGE_HIGH,
-		BLUR_MODE_DOF_FAR_LOW,
-		BLUR_MODE_DOF_FAR_MEDIUM,
-		BLUR_MODE_DOF_FAR_HIGH,
-		BLUR_MODE_SSAO_MERGE,
-		BLUR_MODE_SIMPLY_COPY,
-		BLUR_MODE_MIPMAP,
-		BLUR_MODE_LINEARIZE_DEPTH,
-		BLUR_MODE_MAX,
+	enum CopyMode {
+		COPY_MODE_GAUSSIAN_COPY,
+		COPY_MODE_GAUSSIAN_COPY_8BIT,
+		COPY_MODE_GAUSSIAN_GLOW,
+		COPY_MODE_GAUSSIAN_GLOW_AUTO_EXPOSURE,
+		COPY_MODE_SIMPLY_COPY,
+		COPY_MODE_SIMPLY_COPY_8BIT,
+		COPY_MODE_SIMPLY_COPY_DEPTH,
+		COPY_MODE_MIPMAP,
+		COPY_MODE_LINEARIZE_DEPTH,
+		COPY_MODE_MAX,
 
 	};
 
 	enum {
-		BLUR_FLAG_HORIZONTAL = (1 << 0),
-		BLUR_FLAG_USE_BLUR_SECTION = (1 << 1),
-		BLUR_FLAG_USE_ORTHOGONAL_PROJECTION = (1 << 2),
-		BLUR_FLAG_DOF_NEAR_FIRST_TAP = (1 << 3),
-		BLUR_FLAG_GLOW_FIRST_PASS = (1 << 4),
-		BLUR_FLAG_FLIP_Y = (1 << 5),
-		BLUR_COPY_FORCE_LUMINANCE = (1 << 6)
+		COPY_FLAG_HORIZONTAL = (1 << 0),
+		COPY_FLAG_USE_COPY_SECTION = (1 << 1),
+		COPY_FLAG_USE_ORTHOGONAL_PROJECTION = (1 << 2),
+		COPY_FLAG_DOF_NEAR_FIRST_TAP = (1 << 3),
+		COPY_FLAG_GLOW_FIRST_PASS = (1 << 4),
+		COPY_FLAG_FLIP_Y = (1 << 5),
+		COPY_FLAG_FORCE_LUMINANCE = (1 << 6),
+		COPY_FLAG_ALL_SOURCE = (1 << 7)
 	};
 
-	struct BlurPushConstant {
-		float section[4];
-		float pixel_size[2];
+	struct CopyPushConstant {
+
+		int32_t section[4];
+		int32_t target[2];
 		uint32_t flags;
 		uint32_t pad;
-		//glow
+		// Glow.
 		float glow_strength;
 		float glow_bloom;
 		float glow_hdr_threshold;
 		float glow_hdr_scale;
+
 		float glow_exposure;
 		float glow_white;
 		float glow_luminance_cap;
 		float glow_auto_exposure_grey;
-		//dof
-		float dof_begin;
-		float dof_end;
-		float dof_radius;
-		float dof_pad;
-
-		float dof_dir[2];
+		// DOF.
 		float camera_z_far;
 		float camera_z_near;
+		uint32_t pad2[2];
+	};
+
+	struct Copy {
+		CopyPushConstant push_constant;
+		CopyShaderRD shader;
+		RID shader_version;
+		RID pipelines[COPY_MODE_MAX];
+
+	} copy;
+
+	struct CopyToFbPushConstant {
 
-		float ssao_color[4];
+		float section[4];
+		float pixel_size[2];
+		uint32_t flip_y;
+		uint32_t use_section;
+		uint32_t force_luminance;
+		uint32_t pad[3];
 	};
 
-	struct Blur {
-		BlurPushConstant push_constant;
-		BlurShaderRD shader;
+	struct CopyToFb {
+		CopyToFbPushConstant push_constant;
+		CopyToFbShaderRD shader;
 		RID shader_version;
-		RenderPipelineVertexFormatCacheRD pipelines[BLUR_MODE_MAX];
+		RenderPipelineVertexFormatCacheRD pipeline;
 
-	} blur;
+	} copy_to_fb;
 
 	struct CubemapRoughnessPushConstant {
 		uint32_t face_id;
@@ -164,8 +172,11 @@ class RasterizerEffectsRD {
 		float auto_exposure_grey;
 	};
 
+	/* tonemap actually writes to a framebuffer, which is
+	 * better to do using the raster pipeline rather than
+	 * comptute, as that framebuffer might be in different formats
+	 */
 	struct Tonemap {
-
 		TonemapPushConstant push_constant;
 		TonemapShaderRD shader;
 		RID shader_version;
@@ -196,23 +207,20 @@ class RasterizerEffectsRD {
 	} luminance_reduce;
 
 	struct CopyToDPPushConstant {
+		int32_t screen_size[2];
+		int32_t dest_offset[2];
 		float bias;
 		float z_far;
 		float z_near;
 		uint32_t z_flip;
 	};
 
-	enum CopyMode {
-		COPY_MODE_CUBE_TO_DP,
-		COPY_MODE_MAX
-	};
-
-	struct Copy {
+	struct CoptToDP {
 
-		CopyShaderRD shader;
+		CubeToDpShaderRD shader;
 		RID shader_version;
-		RenderPipelineVertexFormatCacheRD pipelines[COPY_MODE_MAX];
-	} copy;
+		RID pipeline;
+	} cube_to_dp;
 
 	struct BokehPushConstant {
 		uint32_t size[2];
@@ -392,6 +400,10 @@ class RasterizerEffectsRD {
 		SPECULAR_MERGE_MAX
 	};
 
+	/* Specular merge must be done using raster, rather than compute
+	 * because it must continue the existing color buffer
+	 */
+
 	struct SpecularMerge {
 
 		SpecularMergeShaderRD shader;
@@ -537,17 +549,16 @@ class RasterizerEffectsRD {
 	RID _get_compute_uniform_set_from_image_pair(RID p_texture, RID p_texture2);
 
 public:
-	//TODO must re-do most of the shaders in compute
-
-	void region_copy(RID p_source_rd_texture, RID p_dest_framebuffer, const Rect2 &p_region);
-	void copy_to_rect(RID p_source_rd_texture, RID p_dest_framebuffer, const Rect2 &p_rect, bool p_flip_y = false, bool p_force_luminance = false);
-	void copy_to_rect_and_linearize(RID p_source_rd_texture, RID p_dest_framebuffer, const Rect2 &p_rect, bool p_flip_y, float p_z_near, float p_z_far);
-	void gaussian_blur(RID p_source_rd_texture, RID p_framebuffer_half, RID p_rd_texture_half, RID p_dest_framebuffer, const Vector2 &p_pixel_size, const Rect2 &p_region);
-	void gaussian_glow(RID p_source_rd_texture, RID p_framebuffer_half, RID p_rd_texture_half, RID p_dest_framebuffer, const Vector2 &p_pixel_size, float p_strength = 1.0, bool p_first_pass = false, float p_luminance_cap = 16.0, float p_exposure = 1.0, float p_bloom = 0.0, float p_hdr_bleed_treshold = 1.0, float p_hdr_bleed_scale = 1.0, RID p_auto_exposure = RID(), float p_auto_exposure_grey = 1.0);
+	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);
+	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);
+	void copy_depth_to_rect(RID p_source_rd_texture, RID p_dest_framebuffer, const Rect2i &p_rect, bool p_flip_y = false);
+	void copy_depth_to_rect_and_linearize(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, bool p_flip_y, float p_z_near, float p_z_far);
+	void gaussian_blur(RID p_source_rd_texture, RID p_texture, RID p_back_texture, const Rect2i &p_region, bool p_8bit_dst = false);
+	void gaussian_glow(RID p_source_rd_texture, RID p_texture, RID p_back_texture, const Size2i &p_size, float p_strength = 1.0, bool p_first_pass = false, float p_luminance_cap = 16.0, float p_exposure = 1.0, float p_bloom = 0.0, float p_hdr_bleed_treshold = 1.0, float p_hdr_bleed_scale = 1.0, RID p_auto_exposure = RID(), float p_auto_exposure_grey = 1.0);
 
 	void cubemap_roughness(RID p_source_rd_texture, RID p_dest_framebuffer, uint32_t p_face_id, uint32_t p_sample_count, float p_roughness, float p_size);
-	void make_mipmap(RID p_source_rd_texture, RID p_framebuffer_half, const Vector2 &p_pixel_size);
-	void copy_cubemap_to_dp(RID p_source_rd_texture, RID p_dest_framebuffer, const Rect2 &p_rect, float p_z_near, float p_z_far, float p_bias, bool p_dp_flip);
+	void make_mipmap(RID p_source_rd_texture, RID p_dest_texture, const Size2i &p_size);
+	void copy_cubemap_to_dp(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, float p_z_near, float p_z_far, float p_bias, bool p_dp_flip);
 	void luminance_reduction(RID p_source_texture, const Size2i p_source_size, const Vector<RID> p_reduce, RID p_prev_luminance, float p_min_luminance, float p_max_luminance, float p_adjust, bool p_set = false);
 	void bokeh_dof(RID p_base_texture, RID p_depth_texture, const Size2i &p_base_texture_size, RID p_secondary_texture, RID p_bokeh_texture1, RID p_bokeh_texture2, bool p_dof_far, float p_dof_far_begin, float p_dof_far_size, bool p_dof_near, float p_dof_near_begin, float p_dof_near_size, float p_bokeh_size, RS::DOFBokehShape p_bokeh_shape, RS::DOFBlurQuality p_quality, bool p_use_jitter, float p_cam_znear, float p_cam_zfar, bool p_cam_orthogonal);