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

Disallows smaller buffer use for 'sharp' displays and tightens sampling window.

Browse Source
This commit is contained in:
Thomas Harte 2019-06-03 15:57:31 -04:00
parent d80b0cbf90
commit b860ba2ee3
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Outputs/OpenGL/ScanTarget.cpp
View File

@ -393,6 +393,10 @@ Outputs::Display::Metrics &ScanTarget::display_metrics() {
return display_metrics_; return display_metrics_;
} }
bool ScanTarget::is_soft_display_type() {
return modals_.display_type == DisplayType::CompositeColour || modals_.display_type == DisplayType::CompositeMonochrome;
}
void ScanTarget::update(int output_width, int output_height) { void ScanTarget::update(int output_width, int output_height) {
if(fence_ != nullptr) { if(fence_ != nullptr) {
// if the GPU is still busy, don't wait; we'll catch it next time // if the GPU is still busy, don't wait; we'll catch it next time
@ -557,7 +561,7 @@ void ScanTarget::update(int output_width, int output_height) {
// it's a good idea. Go up to a quarter of the requested resolution, subject to // it's a good idea. Go up to a quarter of the requested resolution, subject to
// clamping at each stage. If the output resolution changes, or anything else about // clamping at each stage. If the output resolution changes, or anything else about
// the output pipeline, just start trying the highest size again. // the output pipeline, just start trying the highest size again.
if(display_metrics_.should_lower_resolution()) { if(display_metrics_.should_lower_resolution() && is_soft_display_type()) {
resolution_reduction_level_ = std::min(resolution_reduction_level_+1, 4); resolution_reduction_level_ = std::min(resolution_reduction_level_+1, 4);
} }
if(output_height_ != output_height || did_setup_pipeline) { if(output_height_ != output_height || did_setup_pipeline) {

6
Outputs/OpenGL/ScanTarget.hpp
View File

@ -238,6 +238,12 @@ class ScanTarget: public Outputs::Display::ScanTarget {
void set_sampling_window(int output_Width, int output_height, Shader &target); void set_sampling_window(int output_Width, int output_height, Shader &target);
std::string sampling_function() const; std::string sampling_function() const;
/*!
@returns true if the current display type is a 'soft' one, i.e. one in which
contrast tends to be low, such as a composite colour display.
*/
bool is_soft_display_type();
}; };
} }

2
Outputs/OpenGL/ScanTargetGLSLFragments.cpp
View File

@ -63,7 +63,7 @@ void ScanTarget::set_sampling_window(int output_width, int output_height, Shader
GLfloat texture_offsets[4]; GLfloat texture_offsets[4];
GLfloat angles[4]; GLfloat angles[4];
for(int c = 0; c < 4; ++c) { for(int c = 0; c < 4; ++c) {
texture_offsets[c] = 1.5f * (((one_pixel_width * float(c)) / 3.0f) - (one_pixel_width * 0.5f)); texture_offsets[c] = 1.0f * (((one_pixel_width * float(c)) / 3.0f) - (one_pixel_width * 0.5f));
angles[c] = GLfloat((texture_offsets[c] / clocks_per_angle) * 2.0f * M_PI); angles[c] = GLfloat((texture_offsets[c] / clocks_per_angle) * 2.0f * M_PI);
} }
target.set_uniform("textureCoordinateOffsets", 1, 4, texture_offsets); target.set_uniform("textureCoordinateOffsets", 1, 4, texture_offsets);