From 65377b86f525be43d8af7cc8605e6b8673c2a70d Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 16 Dec 2016 20:33:16 +0100 Subject: [PATCH] Set the right texture sampler for the subsampling shader (used to work by accident). --- mixer.cpp | 3 +++ mixer.h | 1 + 2 files changed, 4 insertions(+) diff --git a/mixer.cpp b/mixer.cpp index 0a7ecc2..44ef76d 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -231,6 +231,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) 2.0f, 0.0f }; cbcr_vbo = generate_vbo(2, GL_FLOAT, sizeof(vertices), vertices); + cbcr_texture_sampler_uniform = glGetUniformLocation(cbcr_program_num, "cbcr_tex"); cbcr_position_attribute_index = glGetAttribLocation(cbcr_program_num, "position"); cbcr_texcoord_attribute_index = glGetAttribLocation(cbcr_program_num, "texcoord"); @@ -906,6 +907,8 @@ void Mixer::subsample_chroma(GLuint src_tex, GLuint dst_tex) float chroma_offset_0[] = { -0.5f / global_flags.width, 0.0f }; set_uniform_vec2(cbcr_program_num, "foo", "chroma_offset_0", chroma_offset_0); + glUniform1i(cbcr_texture_sampler_uniform, 0); + glBindBuffer(GL_ARRAY_BUFFER, cbcr_vbo); check_error(); diff --git a/mixer.h b/mixer.h index 551e217..0de6519 100644 --- a/mixer.h +++ b/mixer.h @@ -310,6 +310,7 @@ private: std::atomic master_clock_channel{0}; std::unique_ptr display_chain; GLuint cbcr_program_num; // Owned by . + GLuint cbcr_texture_sampler_uniform; GLuint cbcr_vbo; // Holds position and texcoord data. GLuint cbcr_position_attribute_index, cbcr_texcoord_attribute_index; std::unique_ptr video_encoder; -- 2.39.2