From 76656fab2383b7814f2caa05bf334aabd2a4d1e5 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sat, 24 Nov 2018 22:39:53 -0500 Subject: [PATCH] Applies harsher filtering. --- Outputs/OpenGL/ScanTarget.cpp | 7 ------- Outputs/OpenGL/ScanTargetGLSLFragments.cpp | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Outputs/OpenGL/ScanTarget.cpp b/Outputs/OpenGL/ScanTarget.cpp index e0ec0ae3e..763cacad5 100644 --- a/Outputs/OpenGL/ScanTarget.cpp +++ b/Outputs/OpenGL/ScanTarget.cpp @@ -174,7 +174,6 @@ void ScanTarget::set_modals(Modals modals) { // Cascade the texture units in use as per the pipeline stages. std::vector input_shaders = {input_shader_.get()}; GLint texture_unit = GLint(UnprocessedLineBufferTextureUnit - GL_TEXTURE0); -// output_shader_->set_uniform("textureName", texture_unit); for(const auto &stage: pipeline_stages_) { input_shaders.push_back(stage.shader.get()); @@ -616,12 +615,6 @@ void ScanTarget::draw(bool synchronous, int output_width, int output_height) { glViewport(0, 0, (GLsizei)output_width, (GLsizei)output_height); glClear(GL_COLOR_BUFFER_BIT); -// unprocessed_line_texture_.bind_texture(); -// unprocessed_line_texture_.draw(float(output_width) / float(output_height), 4.0f / 255.0f); - -// pipeline_stages_.front().target.bind_texture(); -// pipeline_stages_.front().target.draw(float(output_width) / float(output_height), 4.0f / 255.0f); - accumulation_texture_->bind_texture(); accumulation_texture_->draw(float(output_width) / float(output_height), 4.0f / 255.0f); diff --git a/Outputs/OpenGL/ScanTargetGLSLFragments.cpp b/Outputs/OpenGL/ScanTargetGLSLFragments.cpp index 40d73861b..626ecafc7 100644 --- a/Outputs/OpenGL/ScanTargetGLSLFragments.cpp +++ b/Outputs/OpenGL/ScanTargetGLSLFragments.cpp @@ -349,7 +349,7 @@ std::unique_ptr ScanTarget::svideo_to_rgb_shader(int colour_cycle_numera (Colour cycle numerator)/(Colour cycle denominator) gives the number of colour cycles in (processing_width / LineBufferWidth), there'll be at least four samples per colour clock and in practice at most just a shade more than 9. */ - auto coefficients = coefficients_for_filter(colour_cycle_numerator, colour_cycle_denominator, processing_width, 0.5f); + auto coefficients = coefficients_for_filter(colour_cycle_numerator, colour_cycle_denominator, processing_width, 0.25f); auto shader = std::unique_ptr(new Shader( glsl_globals(ShaderType::ProcessedScan) + glsl_default_vertex_shader(ShaderType::ProcessedScan), "#version 150\n" @@ -399,7 +399,7 @@ std::unique_ptr ScanTarget::svideo_to_rgb_shader(int colour_cycle_numera } std::unique_ptr ScanTarget::composite_to_svideo_shader(int colour_cycle_numerator, int colour_cycle_denominator, int processing_width) { - auto coefficients = coefficients_for_filter(colour_cycle_numerator, colour_cycle_denominator, processing_width, 0.75f); + auto coefficients = coefficients_for_filter(colour_cycle_numerator, colour_cycle_denominator, processing_width, 0.5f); auto shader = std::unique_ptr(new Shader( glsl_globals(ShaderType::ProcessedScan) + glsl_default_vertex_shader(ShaderType::ProcessedScan), "#version 150\n"