From b1d5a9a0374262ae1ea53a8ad46999e75720d5e8 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 17 Mar 2017 20:03:31 +0100 Subject: [PATCH 1/1] Fix secondary output from TimecodeRenderer; it was not updated for RGBA updates going away. It somehow worked by accident, though. --- timecode_renderer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/timecode_renderer.cpp b/timecode_renderer.cpp index b70904a..d42020a 100644 --- a/timecode_renderer.cpp +++ b/timecode_renderer.cpp @@ -43,22 +43,22 @@ TimecodeRenderer::TimecodeRenderer(movit::ResourcePool *resource_pool, unsigned "#version 130 \n" "in vec2 tc0; \n" "uniform sampler2D tex; \n" - "out vec4 Y, CbCr, RGBA; \n" + "out vec4 Y, CbCr, YCbCr; \n" "void main() { \n" - " vec4 gray = texture(tex, tc0); \n" - " RGBA = gray.rrra; \n"; + " vec4 gray = texture(tex, tc0); \n"; if (global_flags.ten_bit_output) { frag_shader += " gray.r = gray.r * ((940.0-16.0)/65535.0) + 16.0/65535.0; \n" // Limited-range Y'CbCr. - " Y = gray.rrra; \n" " CbCr = vec4(512.0/65535.0, 512.0/65535.0, 0.0, 1.0); \n"; } else { frag_shader += " gray.r = gray.r * ((235.0-16.0)/255.0) + 16.0/255.0; \n" // Limited-range Y'CbCr. - " Y = gray.rrra; \n" " CbCr = vec4(128.0/255.0, 128.0/255.0, 0.0, 1.0); \n"; } - frag_shader += "} \n"; + frag_shader += + " Y = gray.rrra; \n" + " YCbCr = vec4(Y.r, CbCr.r, CbCr.g, CbCr.a); \n" + "} \n"; vector frag_shader_outputs; program_num = resource_pool->compile_glsl_program(vert_shader, frag_shader, frag_shader_outputs); -- 2.39.2