rg16f motion vectors

nem0 · Sep 22, 2023 · 9297d8d · 9297d8d
1 parent bef985d
commit 9297d8d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/data/pipelines/common.glsl b/data/pipelines/common.glsl
@@ -588,9 +588,7 @@ float rand(vec3 seed)
 vec2 computeStaticObjectMotionVector(vec3 wpos) {
 	vec4 p = Global.view_projection_no_jitter * vec4(wpos, 1);
 	vec4 pos_projected = Global.prev_view_projection_no_jitter * vec4(wpos + Global.to_prev_frame_camera_translation.xyz, 1);
-	vec2 r = (pos_projected.xy / pos_projected.w * 0.5 + 0.5 - (p.xy / p.w * 0.5 + 0.5));	
-	r =  r * 0.5 + 0.5;
-	return r;
+	return pos_projected.xy / pos_projected.w - p.xy / p.w;	
 }
 
 vec2 cameraReproject(vec2 uv, float depth) {

diff --git a/data/pipelines/field_debug.shd b/data/pipelines/field_debug.shd
@@ -96,7 +96,7 @@ fragment_shader [[
 
     void main() {
         vec2 uv = toScreenUV(v_uv);
-		vec4 t = textureLod(u_texture, uv, 0) * 2 - 1;
+		vec4 t = textureLod(u_texture, uv, 0);
         float tt = arrow(gl_FragCoord.xy, (t.xy) * 10000);
 
         o_color = vec4(t.rg * 100, 1 - tt, 1);

diff --git a/data/pipelines/main.pln b/data/pipelines/main.pln
@@ -44,7 +44,7 @@ type GBuffer = {
 local gbuffer_A_desc = createRenderbufferDesc { format = "srgba", debug_name = "gbuffer.A" }
 local gbuffer_B_desc = createRenderbufferDesc { compute_write = true, format = "rgba16", debug_name = "gbuffer.B" }
 local gbuffer_C_desc = createRenderbufferDesc { compute_write = true, format = "rgba8", debug_name = "gbuffer.C" }
-local gbuffer_D_desc = createRenderbufferDesc { compute_write = true, format = "rg16", debug_name = "gbuffer.D" }
+local gbuffer_D_desc = createRenderbufferDesc { compute_write = true, format = "rg16f", debug_name = "gbuffer.D" }
 local gbuffer_DS_desc = createRenderbufferDesc { format = "depth24stencil8", debug_name = "gbuffer_ds" }
 
 local function createGBuffer() : GBuffer 
@@ -201,7 +201,9 @@ end
 local function geomPass(view_params : CameraParams, entities) : GBuffer
 	beginBlock("geom_pass")
 		local gbuffer = createGBuffer()
-
+		setRenderTargets(gbuffer.D)
+		clear(CLEAR_ALL, 0.0, 0.0, 0.0, 1, 0)
+
 		setRenderTargetsDS(gbuffer.A, gbuffer.B, gbuffer.C, gbuffer.D, gbuffer.DS)
 		clear(CLEAR_ALL, 0.0, 0.0, 0.0, 1, 0)
 		pass(view_params)

diff --git a/data/pipelines/surface_base.inc b/data/pipelines/surface_base.inc
@@ -331,7 +331,7 @@ function surface_shader_ex(args)
 				vec4 p = Global.view_projection_no_jitter * v_wpos;
 				#if defined DYNAMIC || defined SKINNED
 					vec2 prev_pos_projected = v_prev_ndcpos_no_jitter.xy / v_prev_ndcpos_no_jitter.w;
-					data.motion = (prev_pos_projected.xy * 0.5 + 0.5 - (p.xy / p.w * 0.5 + 0.5)) * 0.5 + 0.5;
+					data.motion = prev_pos_projected.xy - p.xy / p.w;
 				#else
 					data.motion = computeStaticObjectMotionVector(v_wpos.xyz);
 				#endif

diff --git a/data/pipelines/taa.shd b/data/pipelines/taa.shd
@@ -75,7 +75,12 @@ compute_shader [[
 		if (any(greaterThanEqual(ij, ivec2(u_size.xy)))) return;
 
 		vec2 uv = (vec2(ij) + 0.5) / u_size.xy;
-		vec2 motionvec = toScreenUV(textureLod(u_motion_vectors, uv, 0).xy) * 2 - 1;
+		vec2 motionvec = textureLod(u_motion_vectors, uv, 0).xy;
+		#ifdef _ORIGIN_BOTTOM_LEFT
+			motionvec *= vec2(0.5);
+		#else
+			motionvec *= vec2(0.5, -0.5);
+		#endif
 
 		vec2 uv_prev = uv + motionvec;
 

diff --git a/data/pipelines/textured_quad.shd b/data/pipelines/textured_quad.shd
@@ -16,7 +16,6 @@ vertex_shader [[
 	void main() {
 		vec4 pos = fullscreenQuad(gl_VertexID, v_uv);
 		pos.xy = pos.xy * u_offset_scale.zw + u_offset_scale.xy;
-		pos.y = -pos.y;
 		gl_Position = pos;
 	}
 ]]
@@ -27,7 +26,7 @@ fragment_shader [[
 	layout (location = 0) in vec2 v_uv;
 	layout (location = 0) out vec4 o_color;
 	void main() {
-		vec4 t = textureLod(u_texture, toScreenUV(v_uv), 0);
+		vec4 t = textureLod(u_texture, v_uv, 0);
 		o_color.r = dot(t, u_r_mask) + u_offsets.r;
 		o_color.g = dot(t, u_g_mask) + u_offsets.g;
 		o_color.b = dot(t, u_b_mask) + u_offsets.b;