6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-11 04:28:58 +00:00
Code Issues Projects Releases Wiki Activity

[Re-]Eliminated connection between colour subcarrier frequency and monitor output mode.

Browse Source
This commit is contained in:
Thomas Harte 2017-01-24 20:48:54 -05:00
parent a66a8c31b2
commit 5761c8267b
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Outputs/CRT/Internals/CRTOpenGL.cpp
View File

@ -371,6 +371,7 @@ void OpenGLOutputBuilder::set_output_device(OutputDevice output_device)
composite_src_output_y_ = 0; composite_src_output_y_ = 0;
last_output_width_ = 0; last_output_width_ = 0;
last_output_height_ = 0; last_output_height_ = 0;
set_output_shader_width();
} }
} }
@ -418,10 +419,29 @@ void OpenGLOutputBuilder::set_colour_space_uniforms()
if(composite_chrominance_filter_shader_program_) composite_chrominance_filter_shader_program_->set_colour_conversion_matrices(fromRGB, toRGB); if(composite_chrominance_filter_shader_program_) composite_chrominance_filter_shader_program_->set_colour_conversion_matrices(fromRGB, toRGB);
} }
float OpenGLOutputBuilder::get_composite_output_width() const
{
return ((float)colour_cycle_numerator_ * 4.0f) / (float)(colour_cycle_denominator_ * IntermediateBufferWidth);
}
void OpenGLOutputBuilder::set_output_shader_width()
{
if(output_shader_program_)
{
float width = 1.0f;
switch(output_device_)
{
case Television: width = get_composite_output_width(); break;
case Monitor: width = 1.0f; break;
}
output_shader_program_->set_input_width_scaler(width);
}
}
void OpenGLOutputBuilder::set_timing_uniforms() void OpenGLOutputBuilder::set_timing_uniforms()
{ {
const float colour_subcarrier_frequency = (float)colour_cycle_numerator_ / (float)colour_cycle_denominator_; const float colour_subcarrier_frequency = (float)colour_cycle_numerator_ / (float)colour_cycle_denominator_;
const float output_width = ((float)colour_cycle_numerator_ * 4.0f) / (float)(colour_cycle_denominator_ * IntermediateBufferWidth); const float output_width = get_composite_output_width();
const float sample_cycles_per_line = cycles_per_line_ / output_width; const float sample_cycles_per_line = cycles_per_line_ / output_width;
if(composite_separation_filter_program_) if(composite_separation_filter_program_)
@ -437,12 +457,12 @@ void OpenGLOutputBuilder::set_timing_uniforms()
} }
if(rgb_filter_shader_program_) if(rgb_filter_shader_program_)
{ {
rgb_filter_shader_program_->set_width_scalers(output_width, output_width); rgb_filter_shader_program_->set_width_scalers(1.0f, 1.0f);
rgb_filter_shader_program_->set_filter_coefficients(sample_cycles_per_line, (float)input_frequency_ * 0.5f); rgb_filter_shader_program_->set_filter_coefficients(sample_cycles_per_line, (float)input_frequency_ * 0.5f);
} }
if(output_shader_program_) if(output_shader_program_)
{ {
output_shader_program_->set_input_width_scaler(output_width); set_output_shader_width();
output_shader_program_->set_timing(height_of_display_, cycles_per_line_, horizontal_scan_period_, vertical_scan_period_, vertical_period_divider_); output_shader_program_->set_timing(height_of_display_, cycles_per_line_, horizontal_scan_period_, vertical_scan_period_, vertical_period_divider_);
} }
if(composite_input_shader_program_) if(composite_input_shader_program_)
@ -452,6 +472,6 @@ void OpenGLOutputBuilder::set_timing_uniforms()
} }
if(rgb_input_shader_program_) if(rgb_input_shader_program_)
{ {
rgb_input_shader_program_->set_width_scalers(1.0f, output_width); rgb_input_shader_program_->set_width_scalers(1.0f, 1.0f);
} }
} }

2
Outputs/CRT/Internals/CRTOpenGL.hpp
View File

@ -94,6 +94,8 @@ class OpenGLOutputBuilder {
void reset_all_OpenGL_state(); void reset_all_OpenGL_state();
GLsync fence_; GLsync fence_;
float get_composite_output_width() const;
void set_output_shader_width();
public: public:
// These two are protected by output_mutex_. // These two are protected by output_mutex_.