6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Applies harsher filtering.

Browse Source
This commit is contained in:
Thomas Harte 2018-11-24 22:39:53 -05:00
parent cf49603a9e
commit 76656fab23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Outputs/OpenGL/ScanTarget.cpp
View File

@ -174,7 +174,6 @@ void ScanTarget::set_modals(Modals modals) {
// Cascade the texture units in use as per the pipeline stages. // Cascade the texture units in use as per the pipeline stages.
std::vector<Shader *> input_shaders = {input_shader_.get()}; std::vector<Shader *> input_shaders = {input_shader_.get()};
GLint texture_unit = GLint(UnprocessedLineBufferTextureUnit - GL_TEXTURE0); GLint texture_unit = GLint(UnprocessedLineBufferTextureUnit - GL_TEXTURE0);
// output_shader_->set_uniform("textureName", texture_unit);
for(const auto &stage: pipeline_stages_) { for(const auto &stage: pipeline_stages_) {
input_shaders.push_back(stage.shader.get()); 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); glViewport(0, 0, (GLsizei)output_width, (GLsizei)output_height);
glClear(GL_COLOR_BUFFER_BIT); 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_->bind_texture();
accumulation_texture_->draw(float(output_width) / float(output_height), 4.0f / 255.0f); accumulation_texture_->draw(float(output_width) / float(output_height), 4.0f / 255.0f);

4
Outputs/OpenGL/ScanTargetGLSLFragments.cpp
View File

@ -349,7 +349,7 @@ std::unique_ptr<Shader> 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), (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. 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<Shader>(new Shader( auto shader = std::unique_ptr<Shader>(new Shader(
glsl_globals(ShaderType::ProcessedScan) + glsl_default_vertex_shader(ShaderType::ProcessedScan), glsl_globals(ShaderType::ProcessedScan) + glsl_default_vertex_shader(ShaderType::ProcessedScan),
"#version 150\n" "#version 150\n"
@ -399,7 +399,7 @@ std::unique_ptr<Shader> ScanTarget::svideo_to_rgb_shader(int colour_cycle_numera
} }
std::unique_ptr<Shader> ScanTarget::composite_to_svideo_shader(int colour_cycle_numerator, int colour_cycle_denominator, int processing_width) { std::unique_ptr<Shader> 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<Shader>(new Shader( auto shader = std::unique_ptr<Shader>(new Shader(
glsl_globals(ShaderType::ProcessedScan) + glsl_default_vertex_shader(ShaderType::ProcessedScan), glsl_globals(ShaderType::ProcessedScan) + glsl_default_vertex_shader(ShaderType::ProcessedScan),
"#version 150\n" "#version 150\n"