6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-19 19:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Factor out clock multiplier selection; apply composition uniforms.

Browse Source
This commit is contained in:
Thomas Harte
2026-01-28 17:43:19 -05:00
parent 1be9b1ed29
commit e72ab3dd01
6 changed files with 105 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Outputs/OpenGL/ScanTarget.cpp
+33 -17
View File
@@ -11,6 +11,7 @@
#include "OpenGL.hpp"
#include "Primitives/Rectangle.hpp"
#include "Outputs/ScanTargets/FilterGenerator.hpp"
#include "CompositionShader.hpp"
#include <algorithm>
@@ -106,28 +107,43 @@ ScanTarget::ScanTarget(const API api, const GLuint target_framebuffer, const flo
// TEST CODE. NOCOMMIT.
OpenGL::composition_shader(api, InputDataType::Luminance1, DisplayType::CompositeColour);
OpenGL::composition_shader(api, InputDataType::Luminance8, DisplayType::CompositeColour);
OpenGL::composition_shader(api, InputDataType::PhaseLinkedLuminance8, DisplayType::CompositeColour);
const auto buffer_width = FilterGenerator::SuggestedBufferWidth;
const float sample_multiplier =
FilterGenerator::suggested_sample_multiplier(227.5f, 1320);
OpenGL::composition_shader(api, InputDataType::Luminance8Phase8, DisplayType::SVideo);
OpenGL::composition_shader(api, InputDataType::Luminance8Phase8, DisplayType::CompositeColour);
for(auto &pair: {
std::make_pair(InputDataType::Luminance1, DisplayType::CompositeColour),
std::make_pair(InputDataType::Luminance8, DisplayType::CompositeColour),
std::make_pair(InputDataType::PhaseLinkedLuminance8, DisplayType::CompositeColour),
OpenGL::composition_shader(api, InputDataType::Red1Green1Blue1, DisplayType::RGB);
OpenGL::composition_shader(api, InputDataType::Red1Green1Blue1, DisplayType::SVideo);
OpenGL::composition_shader(api, InputDataType::Red1Green1Blue1, DisplayType::CompositeColour);
std::make_pair(InputDataType::Luminance8Phase8, DisplayType::SVideo),
std::make_pair(InputDataType::Luminance8Phase8, DisplayType::CompositeColour),
OpenGL::composition_shader(api, InputDataType::Red2Green2Blue2, DisplayType::RGB);
OpenGL::composition_shader(api, InputDataType::Red2Green2Blue2, DisplayType::SVideo);
OpenGL::composition_shader(api, InputDataType::Red2Green2Blue2, DisplayType::CompositeColour);
std::make_pair(InputDataType::Red1Green1Blue1, DisplayType::RGB),
std::make_pair(InputDataType::Red1Green1Blue1, DisplayType::SVideo),
std::make_pair(InputDataType::Red1Green1Blue1, DisplayType::CompositeColour),
OpenGL::composition_shader(api, InputDataType::Red4Green4Blue4, DisplayType::RGB);
OpenGL::composition_shader(api, InputDataType::Red4Green4Blue4, DisplayType::SVideo);
OpenGL::composition_shader(api, InputDataType::Red4Green4Blue4, DisplayType::CompositeColour);
std::make_pair(InputDataType::Red2Green2Blue2, DisplayType::RGB),
std::make_pair(InputDataType::Red2Green2Blue2, DisplayType::SVideo),
std::make_pair(InputDataType::Red2Green2Blue2, DisplayType::CompositeColour),
OpenGL::composition_shader(api, InputDataType::Red8Green8Blue8, DisplayType::RGB);
OpenGL::composition_shader(api, InputDataType::Red8Green8Blue8, DisplayType::SVideo);
OpenGL::composition_shader(api, InputDataType::Red8Green8Blue8, DisplayType::CompositeColour);
std::make_pair(InputDataType::Red4Green4Blue4, DisplayType::RGB),
std::make_pair(InputDataType::Red4Green4Blue4, DisplayType::SVideo),
std::make_pair(InputDataType::Red4Green4Blue4, DisplayType::CompositeColour),
std::make_pair(InputDataType::Red8Green8Blue8, DisplayType::RGB),
std::make_pair(InputDataType::Red8Green8Blue8, DisplayType::SVideo),
std::make_pair(InputDataType::Red8Green8Blue8, DisplayType::CompositeColour),
}) {
OpenGL::composition_shader(
api,
pair.first,
pair.second,
sample_multiplier,
2048, 2048,
buffer_width, 2048
).bind();
}
}
ScanTarget::~ScanTarget() {