6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 01:31:42 +00:00
Code Issues Projects Releases Wiki Activity

Removes stale sampling functions.

Browse Source
This commit is contained in:
Thomas Harte 2018-11-22 22:47:29 -05:00
parent b9aca39eb0
commit 770d7e90e9
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Components/9918/9918.cpp
View File

@ -51,6 +51,8 @@ struct ReverseTable {
Base::Base(Personality p) : Base::Base(Personality p) :
personality_(p), personality_(p),
crt_(CRTCyclesPerLine, CRTCyclesDivider, Outputs::Display::Type::NTSC60, Outputs::Display::InputDataType::Red8Green8Blue8) { crt_(CRTCyclesPerLine, CRTCyclesDivider, Outputs::Display::Type::NTSC60, Outputs::Display::InputDataType::Red8Green8Blue8) {
// Unimaginatively, this class just passes RGB through to the shader. Investigation is needed
// into whether there's a more natural form. It feels unlikely given the diversity of chips modelled.
switch(p) { switch(p) {
case TI::TMS::TMS9918A: case TI::TMS::TMS9918A:
@ -84,13 +86,6 @@ Base::Base(Personality p) :
TMS9918::TMS9918(Personality p): TMS9918::TMS9918(Personality p):
Base(p) { Base(p) {
// Unimaginatively, this class just passes RGB through to the shader. Investigation is needed
// into whether there's a more natural form.
// crt_.set_rgb_sampling_function(
// "vec3 rgb_sample(usampler2D sampler, vec2 coordinate)"
// "{"
// "return texture(sampler, coordinate).rgb / vec3(255.0);"
// "}");
// crt_->set_video_signal(Outputs::Display::VideoSignal::RGB); // crt_->set_video_signal(Outputs::Display::VideoSignal::RGB);
crt_.set_visible_area(Outputs::Display::Rect(0.055f, 0.025f, 0.9f, 0.9f)); crt_.set_visible_area(Outputs::Display::Rect(0.055f, 0.025f, 0.9f, 0.9f));

8
Machines/AppleII/Video.cpp
View File

@ -15,14 +15,6 @@ VideoBase::VideoBase(bool is_iie, std::function<void(Cycles)> &&target) :
is_iie_(is_iie), is_iie_(is_iie),
deferrer_(std::move(target)) { deferrer_(std::move(target)) {
// Set a composite sampling function that assumes one byte per pixel input, and
// accepts any non-zero value as being fully on, zero being fully off.
// crt_->set_composite_sampling_function(
// "float composite_sample(usampler2D sampler, vec2 coordinate, float phase, float amplitude)"
// "{"
// "return clamp(texture(sampler, coordinate).r, 0.0, 0.66);"
// "}");
// Show only the centre 75% of the TV frame. // Show only the centre 75% of the TV frame.
// crt_->set_video_signal(Outputs::Display::VideoSignal::Composite); // crt_->set_video_signal(Outputs::Display::VideoSignal::Composite);
crt_.set_visible_area(Outputs::Display::Rect(0.118f, 0.122f, 0.77f, 0.77f)); crt_.set_visible_area(Outputs::Display::Rect(0.118f, 0.122f, 0.77f, 0.77f));

8
Machines/ZX8081/Video.cpp
View File

@ -25,14 +25,6 @@ const std::size_t StandardAllocationSize = 320;
Video::Video() : Video::Video() :
crt_(207 * 2, 1, Outputs::Display::Type::PAL50, Outputs::Display::InputDataType::Luminance1) { crt_(207 * 2, 1, Outputs::Display::Type::PAL50, Outputs::Display::InputDataType::Luminance1) {
// Set a composite sampling function that assumes two-level input; either a byte is 0, which is black,
// or it is non-zero, which is white.
// crt_.set_composite_sampling_function(
// "float composite_sample(usampler2D sampler, vec2 coordinate, float phase, float amplitude)"
// "{"
// "return texture(sampler, coordinate).r;"
// "}");
// Show only the centre 80% of the TV frame. // Show only the centre 80% of the TV frame.
// crt_.set_video_signal(Outputs::Display::VideoSignal::Composite); // crt_.set_video_signal(Outputs::Display::VideoSignal::Composite);
crt_.set_visible_area(Outputs::Display::Rect(0.1f, 0.1f, 0.8f, 0.8f)); crt_.set_visible_area(Outputs::Display::Rect(0.1f, 0.1f, 0.8f, 0.8f));