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

Merge pull request #673 from TomHarte/FewerSpans

Browse Source 
Reduces Atari ST output heft
This commit is contained in:
Thomas Harte 2019-11-12 19:37:53 -05:00 committed by GitHub
commit 2026761a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Machines/Atari/ST/Video.cpp
View File

@ -11,6 +11,7 @@
#include "../../../Outputs/Log.hpp"
#include <algorithm>
#include <cstring>
using namespace Atari::ST;
@ -377,9 +378,13 @@ void Video::Shifter::flush_output(OutputMode next_mode) {
case OutputMode::Sync: crt_.output_sync(duration_); break;
case OutputMode::Blank: crt_.output_blank(duration_); break;
case OutputMode::Border: {
uint16_t *const colour_pointer = reinterpret_cast<uint16_t *>(crt_.begin_data(1));
if(colour_pointer) *colour_pointer = border_colour_;
crt_.output_level(duration_);
// if(!border_colour_) {
// crt_.output_blank(duration_);
// } else {
uint16_t *const colour_pointer = reinterpret_cast<uint16_t *>(crt_.begin_data(1));
if(colour_pointer) *colour_pointer = border_colour_;
crt_.output_level(duration_);
// }
} break;
case OutputMode::Pixels: {
crt_.output_data(duration_, pixel_pointer_);
@ -428,9 +433,34 @@ void Video::Shifter::output_border(int duration, OutputBpp bpp) {
}
void Video::Shifter::output_pixels(int duration, OutputBpp bpp) {
// If the shifter is empty, redirect this to an output_level call.
// If the shifter is empty and there's no pixel buffer at present,
// redirect this to an output_level call. Otherwise, do a quick
// memset-type fill, since the special case has been detected anyway.
if(!output_shifter_) {
output_border(duration, bpp);
if(!pixel_buffer_) {
output_border(duration, bpp);
} else {
duration_ += duration;
switch(bpp_) {
case OutputBpp::One: {
const size_t pixels = size_t(duration << 1);
memset(&pixel_buffer_[pixel_pointer_], 0, pixels * sizeof(uint16_t));
pixel_pointer_ += pixels;
} break;
default:
case OutputBpp::Four:
assert(!(duration & 1));
duration >>= 1;
case OutputBpp::Two: {
while(duration--) {
pixel_buffer_[pixel_pointer_] = palette_[0];
++pixel_pointer_;
}
} break;
}
}
return;
}