X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=blend.frag;h=eb3fc80753fa0ddec596b8c2fc1a686cd7973b61;hb=75564b80c6283970c355e43d5e06493a99e32489;hp=154538ea9baa049d6b2c76635b05b079f31fef63;hpb=a19f7e1c7efbea4b9fbf631156e3de51d62ac477;p=nageru

diff --git a/blend.frag b/blend.frag
index 154538e..eb3fc80 100644
--- a/blend.frag
+++ b/blend.frag
@@ -1,35 +1,49 @@
 #version 450 core
 
-in vec2 tc;
+in vec3 tc;
+
+#ifdef SPLIT_YCBCR_OUTPUT
+out float Y;
+out vec2 CbCr;
+#else
 out vec4 rgba;
+#endif
 
-uniform sampler2D image0_tex, image1_tex, flow_tex;
-uniform float alpha, flow_consistency_tolerance;
+uniform sampler2DArray image_tex;
+uniform sampler2D flow_tex;
+uniform float alpha;
 
 void main()
 {
-	vec2 flow = texture(flow_tex, tc).xy;
-	vec4 I_0 = texture(image0_tex, tc - alpha * flow);
-	vec4 I_1 = texture(image1_tex, tc + (1.0f - alpha) * flow);
+	vec2 flow = texture(flow_tex, tc.xy).xy;
+	vec4 I_0 = texture(image_tex, vec3(tc.xy - alpha * flow, 0));
+	vec4 I_1 = texture(image_tex, vec3(tc.xy + (1.0f - alpha) * flow, 1));
 
 	// Occlusion reasoning:
 
-	vec2 size = textureSize(image0_tex, 0);
+	vec2 size = textureSize(image_tex, 0).xy;
 
 	// Follow the flow back to the initial point (where we sample I_0 from), then forward again.
 	// See how well we match the point we started at, which is out flow consistency.
-	float d0 = alpha * length(size * (texture(flow_tex, tc - alpha * flow).xy - flow));
+	float d0 = alpha * length(size * (texture(flow_tex, vec2(tc.xy - alpha * flow)).xy - flow));
 
 	// Same for d1.
-	float d1 = (1.0f - alpha) * length(size * (texture(flow_tex, tc + (1.0f - alpha) * flow).xy - flow));
+	float d1 = (1.0f - alpha) * length(size * (texture(flow_tex, vec2(tc.xy + (1.0f - alpha) * flow)).xy - flow));
 
+	vec4 result;
 	if (max(d0, d1) < 3.0f) {  // Arbitrary constant, not all that tuned. The UW paper says 1.0 is fine for ground truth.
 		// Both are visible, so blend.
-		rgba = I_0 + alpha * (I_1 - I_0);
+		result = I_0 + alpha * (I_1 - I_0);
 	} else if (d0 < d1) {
-		rgba = I_0;
+		result = I_0;
 	} else {
-		rgba = I_1;
+		result = I_1;
 	}
 
+#ifdef SPLIT_YCBCR_OUTPUT
+	Y = result.r;
+	CbCr = result.gb;
+#else
+	rgba = result;
+#endif
 }