X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ycbcr_conversion_effect.frag;h=a0b896fe0bcd665da469d837a486d40c6865c743;hb=HEAD;hp=4ef38016a7240e88023e32b7b5e0a8764b372526;hpb=5b08f06cd4547102186932ce789788e07ea8fd8c;p=movit

diff --git a/ycbcr_conversion_effect.frag b/ycbcr_conversion_effect.frag
index 4ef3801..a0b896f 100644
--- a/ycbcr_conversion_effect.frag
+++ b/ycbcr_conversion_effect.frag
@@ -3,10 +3,6 @@
 #define YCBCR_ALSO_OUTPUT_RGBA 0
 #endif
 
-uniform sampler2D PREFIX(tex_y);
-uniform sampler2D PREFIX(tex_cb);
-uniform sampler2D PREFIX(tex_cr);
-
 #if YCBCR_ALSO_OUTPUT_RGBA
 vec4[2] FUNCNAME(vec2 tc) {
 #else
@@ -17,16 +13,16 @@ vec4 FUNCNAME(vec2 tc) {
 
 	ycbcr_a.rgb = PREFIX(ycbcr_matrix) * rgba.rgb + PREFIX(offset);
 
-#if YCBCR_CLAMP_RANGE
-	// If we use limited-range Y'CbCr, the card's usual 0–255 clamping
-	// won't be enough, so we need to clamp ourselves here.
-	//
-	// We clamp before dither, which is a bit unfortunate, since
-	// it means dither can take us out of the clamped range again.
-	// However, since DitherEffect never adds enough dither to change
-	// the quantized levels, we will be fine in practice.
-	ycbcr_a.rgb = clamp(ycbcr_a.rgb, PREFIX(ycbcr_min), PREFIX(ycbcr_max));
-#endif
+	if (PREFIX(clamp_range)) {
+		// If we use limited-range Y'CbCr, the card's usual 0–255 clamping
+		// won't be enough, so we need to clamp ourselves here.
+		//
+		// We clamp before dither, which is a bit unfortunate, since
+		// it means dither can take us out of the clamped range again.
+		// However, since DitherEffect never adds enough dither to change
+		// the quantized levels, we will be fine in practice.
+		ycbcr_a.rgb = clamp(ycbcr_a.rgb, PREFIX(ycbcr_min), PREFIX(ycbcr_max));
+	}
 
 	ycbcr_a.a = rgba.a;