X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.frag;h=b84499d4408b4c1a97ce41785f4e7104573b7ebb;hp=8da8256c4b10858fe22fac7fe81b4305a3cb7868;hb=f705cd2a092c0f41603f0d4d619f72dbde476212;hpb=9e62fbe2ac764479c449472d8bda52ac4df0de91

diff --git a/ycbcr_input.frag b/ycbcr_input.frag
index 8da8256..b84499d 100644
--- a/ycbcr_input.frag
+++ b/ycbcr_input.frag
@@ -1,6 +1,7 @@
-uniform sampler2D PREFIX(tex_y);
-uniform sampler2D PREFIX(tex_cb);
-uniform sampler2D PREFIX(tex_cr);
+// Implicit uniforms:
+// uniform sampler2D PREFIX(tex_y);
+// uniform sampler2D PREFIX(tex_cb);
+// uniform sampler2D PREFIX(tex_cr);
 
 vec4 FUNCNAME(vec2 tc) {
 	// OpenGL's origin is bottom-left, but most graphics software assumes
@@ -9,12 +10,11 @@ vec4 FUNCNAME(vec2 tc) {
 	tc.y = 1.0 - tc.y;
 
 	vec3 ycbcr;
-	ycbcr.x = texture2D(PREFIX(tex_y), tc).x;
-	ycbcr.y = texture2D(PREFIX(tex_cb), tc + PREFIX(cb_offset)).x;
-	ycbcr.z = texture2D(PREFIX(tex_cr), tc + PREFIX(cr_offset)).x;
+	ycbcr.x = tex2D(PREFIX(tex_y), tc).x;
+	ycbcr.y = tex2D(PREFIX(tex_cb), tc + PREFIX(cb_offset)).x;
+	ycbcr.z = tex2D(PREFIX(tex_cr), tc + PREFIX(cr_offset)).x;
 
 	ycbcr -= PREFIX(offset);
-	ycbcr *= PREFIX(scale);
 
 	vec4 rgba;
 	rgba.rgb = PREFIX(inv_ycbcr_matrix) * ycbcr;