6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 23:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Switches the Apple II to one byte per pixel.

Browse Source 
Just trying to get it right for now; optimisation to come.
This commit is contained in:
Thomas Harte 2018-06-02 22:03:45 -04:00
parent 80b281d9f1
commit d84b8700a3
2 changed files with 75 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Machines/AppleII/Video.cpp
View File

@ -10,28 +10,16 @@
using namespace AppleII::Video; using namespace AppleII::Video;
namespace {
struct ScaledByteFiller {
ScaledByteFiller() {
VideoBase::setup_tables();
}
} throwaway;
}
VideoBase::VideoBase() : VideoBase::VideoBase() :
crt_(new Outputs::CRT::CRT(455, 1, Outputs::CRT::DisplayType::NTSC60, 1)) { crt_(new Outputs::CRT::CRT(910, 1, Outputs::CRT::DisplayType::NTSC60, 1)) {
// Set a composite sampling function that assumes 1bpp input, and uses just 7 bits per byte. // 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( crt_->set_composite_sampling_function(
"float composite_sample(usampler2D sampler, vec2 coordinate, vec2 icoordinate, float phase, float amplitude)" "float composite_sample(usampler2D sampler, vec2 coordinate, vec2 icoordinate, float phase, float amplitude)"
"{" "{"
"uint texValue = texture(sampler, vec2(icoordinate.x / (7*textureSize(sampler, 0).x), coordinate.y)).r;" "return texture(sampler, coordinate).r;"
"texValue >>= int(icoordinate.x) % 7;"
"return float(texValue & 1u);"
"}"); "}");
crt_->set_integer_coordinate_multiplier(7.0f);
// Show only the centre 75% of the TV frame. // Show only the centre 75% of the TV frame.
crt_->set_video_signal(Outputs::CRT::VideoSignal::Composite); crt_->set_video_signal(Outputs::CRT::VideoSignal::Composite);
@ -43,56 +31,6 @@ Outputs::CRT::CRT *VideoBase::get_crt() {
return crt_.get(); return crt_.get();
} }
uint16_t VideoBase::scaled_byte[256];
uint16_t VideoBase::low_resolution_patterns[2][16];
void VideoBase::setup_tables() {
// Rules of Apple II high resolution video:
//
// Bit 0 appears on screen first. Then bit 1. Etc to bit 6.
//
// If bit 7 is set, the whole serialisation is delayed for half a pixel, holding
// whichever level was previously being output.
for(int c = 0; c < 128; ++c) {
const uint16_t value =
((c & 0x01) ? 0x0003 : 0x0000) |
((c & 0x02) ? 0x000c : 0x0000) |
((c & 0x04) ? 0x0030 : 0x0000) |
((c & 0x08) ? 0x0140 : 0x0000) |
((c & 0x10) ? 0x0600 : 0x0000) |
((c & 0x20) ? 0x1800 : 0x0000) |
((c & 0x40) ? 0x6000 : 0x0000);
uint8_t *const table_entry = reinterpret_cast<uint8_t *>(&scaled_byte[c]);
table_entry[0] = static_cast<uint8_t>(value & 0xff);
table_entry[1] = static_cast<uint8_t>(value >> 8);
}
for(int c = 128; c < 256; ++c) {
uint8_t *const source_table_entry = reinterpret_cast<uint8_t *>(&scaled_byte[c & 0x7f]);
uint8_t *const destination_table_entry = reinterpret_cast<uint8_t *>(&scaled_byte[c]);
destination_table_entry[0] = static_cast<uint8_t>(source_table_entry[0] << 1);
destination_table_entry[1] = static_cast<uint8_t>((source_table_entry[1] << 1) | (source_table_entry[0] >> 6));
}
for(int c = 0; c < 16; ++c) {
// Produce the whole 28-bit pattern that would cover two columns.
int pattern = 0;
for(int l = 0; l < 7; ++l) {
pattern <<= 4;
pattern |= c;
}
// Pack that 28-bit pattern into the appropriate look-up tables.
uint8_t *const left_entry = reinterpret_cast<uint8_t *>(&low_resolution_patterns[0][c]);
uint8_t *const right_entry = reinterpret_cast<uint8_t *>(&low_resolution_patterns[1][c]);
left_entry[0] = static_cast<uint8_t>(pattern);
left_entry[1] = static_cast<uint8_t>(pattern >> 7);
right_entry[0] = static_cast<uint8_t>(pattern >> 14);
right_entry[1] = static_cast<uint8_t>(pattern >> 21);
}
}
void VideoBase::set_graphics_mode() { void VideoBase::set_graphics_mode() {
use_graphics_mode_ = true; use_graphics_mode_ = true;
} }

103
Machines/AppleII/Video.hpp
View File

@ -27,7 +27,6 @@ class BusHandler {
class VideoBase { class VideoBase {
public: public:
VideoBase(); VideoBase();
static void setup_tables();
/// @returns The CRT this video feed is feeding. /// @returns The CRT this video feed is feeding.
Outputs::CRT::CRT *get_crt(); Outputs::CRT::CRT *get_crt();
@ -46,9 +45,12 @@ class VideoBase {
protected: protected:
std::unique_ptr<Outputs::CRT::CRT> crt_; std::unique_ptr<Outputs::CRT::CRT> crt_;
uint8_t *pixel_pointer_ = nullptr;
int pixel_pointer_column_ = 0;
bool pixels_are_high_density_ = false;
int video_page_ = 0; int video_page_ = 0;
int row_ = 0, column_ = 0, flash_ = 0; int row_ = 0, column_ = 0, flash_ = 0;
uint16_t *pixel_pointer_ = nullptr;
std::vector<uint8_t> character_rom_; std::vector<uint8_t> character_rom_;
enum class GraphicsMode { enum class GraphicsMode {
@ -58,10 +60,7 @@ class VideoBase {
} graphics_mode_ = GraphicsMode::LowRes; } graphics_mode_ = GraphicsMode::LowRes;
bool use_graphics_mode_ = false; bool use_graphics_mode_ = false;
bool mixed_mode_ = false; bool mixed_mode_ = false;
uint16_t graphics_carry_ = 0; uint8_t graphics_carry_ = 0;
static uint16_t scaled_byte[256];
static uint16_t low_resolution_patterns[2][16];
}; };
template <class BusHandler> class Video: public VideoBase { template <class BusHandler> class Video: public VideoBase {
@ -91,7 +90,7 @@ template <class BusHandler> class Video: public VideoBase {
const int cycles_this_line = std::min(65 - column_, int_cycles); const int cycles_this_line = std::min(65 - column_, int_cycles);
if(row_ >= first_sync_line && row_ < first_sync_line + 3) { if(row_ >= first_sync_line && row_ < first_sync_line + 3) {
crt_->output_sync(static_cast<unsigned int>(cycles_this_line) * 7); crt_->output_sync(static_cast<unsigned int>(cycles_this_line) * 14);
} else { } else {
const int ending_column = column_ + cycles_this_line; const int ending_column = column_ + cycles_this_line;
const GraphicsMode line_mode = use_graphics_mode_ ? graphics_mode_ : GraphicsMode::Text; const GraphicsMode line_mode = use_graphics_mode_ ? graphics_mode_ : GraphicsMode::Text;
@ -101,8 +100,13 @@ template <class BusHandler> class Video: public VideoBase {
// of line 192. // of line 192.
if(column_ < 40) { if(column_ < 40) {
if(row_ < 192) { if(row_ < 192) {
if(!column_) { GraphicsMode pixel_mode = (!mixed_mode_ || row_ < 160) ? line_mode : GraphicsMode::Text;
pixel_pointer_ = reinterpret_cast<uint16_t *>(crt_->allocate_write_area(80, 2)); bool requires_high_density = pixel_mode != GraphicsMode::Text;
if(!column_ || requires_high_density != pixels_are_high_density_) {
if(column_) output_data_to_column(column_);
pixel_pointer_ = crt_->allocate_write_area(561);
pixel_pointer_column_ = column_;
pixels_are_high_density_ = requires_high_density;
graphics_carry_ = 0; graphics_carry_ = 0;
} }
@ -111,10 +115,7 @@ template <class BusHandler> class Video: public VideoBase {
const int pixel_row = row_ & 7; const int pixel_row = row_ & 7;
const uint16_t row_address = static_cast<uint16_t>((character_row >> 3) * 40 + ((character_row&7) << 7)); const uint16_t row_address = static_cast<uint16_t>((character_row >> 3) * 40 + ((character_row&7) << 7));
const uint16_t text_address = static_cast<uint16_t>(((video_page_+1) * 0x400) + row_address); const uint16_t text_address = static_cast<uint16_t>(((video_page_+1) * 0x400) + row_address);
const uint16_t graphics_address = static_cast<uint16_t>(((video_page_+1) * 0x2000) + row_address + ((pixel_row&7) << 10));
const int row_shift = (row_&4);
GraphicsMode pixel_mode = (!mixed_mode_ || row_ < 160) ? line_mode : GraphicsMode::Text;
switch(pixel_mode) { switch(pixel_mode) {
case GraphicsMode::Text: { case GraphicsMode::Text: {
const uint8_t inverses[] = { const uint8_t inverses[] = {
@ -128,35 +129,71 @@ template <class BusHandler> class Video: public VideoBase {
const std::size_t character_address = static_cast<std::size_t>(((character & 0x3f) << 3) + pixel_row); const std::size_t character_address = static_cast<std::size_t>(((character & 0x3f) << 3) + pixel_row);
const uint8_t character_pattern = character_rom_[character_address] ^ inverses[character >> 6]; const uint8_t character_pattern = character_rom_[character_address] ^ inverses[character >> 6];
pixel_pointer_[c] = scaled_byte[character_pattern & 0x7f];
int mask = 0x01;
for(int p = 0; p < 7; ++p) {
pixel_pointer_[p] = character_pattern & mask;
mask <<= 1;
}
graphics_carry_ = character_pattern & 0x40;
pixel_pointer_ += 7;
} }
} break; } break;
case GraphicsMode::LowRes: case GraphicsMode::LowRes: {
const int row_shift = (row_&4);
for(int c = column_; c < pixel_end; ++c) { for(int c = column_; c < pixel_end; ++c) {
const uint8_t character = bus_handler_.perform_read(static_cast<uint16_t>(text_address + c)); const uint8_t nibble = (bus_handler_.perform_read(static_cast<uint16_t>(text_address + c)) >> row_shift) & 0x0f;
pixel_pointer_[c] = low_resolution_patterns[c&1][(character >> row_shift)&0xf];
}
break;
case GraphicsMode::HighRes: if(c&1) {
pixel_pointer_[0] = pixel_pointer_[4] = pixel_pointer_[8] = pixel_pointer_[12] = nibble & 4;
pixel_pointer_[1] = pixel_pointer_[5] = pixel_pointer_[9] = pixel_pointer_[13] = nibble & 8;
pixel_pointer_[2] = pixel_pointer_[6] = pixel_pointer_[10] = nibble & 1;
pixel_pointer_[3] = pixel_pointer_[7] = pixel_pointer_[11] = nibble & 2;
graphics_carry_ = nibble & 8;
} else {
pixel_pointer_[0] = pixel_pointer_[4] = pixel_pointer_[8] = pixel_pointer_[12] = nibble & 1;
pixel_pointer_[1] = pixel_pointer_[5] = pixel_pointer_[9] = pixel_pointer_[13] = nibble & 2;
pixel_pointer_[2] = pixel_pointer_[6] = pixel_pointer_[10] = nibble & 4;
pixel_pointer_[3] = pixel_pointer_[7] = pixel_pointer_[11] = nibble & 8;
graphics_carry_ = nibble & 2;
}
pixel_pointer_ += 14;
}
} break;
case GraphicsMode::HighRes: {
const uint16_t graphics_address = static_cast<uint16_t>(((video_page_+1) * 0x2000) + row_address + ((pixel_row&7) << 10));
for(int c = column_; c < pixel_end; ++c) { for(int c = column_; c < pixel_end; ++c) {
const uint8_t graphic = bus_handler_.perform_read(static_cast<uint16_t>(graphics_address + c)); const uint8_t graphic = bus_handler_.perform_read(static_cast<uint16_t>(graphics_address + c));
pixel_pointer_[c] = scaled_byte[graphic];
if(graphic & 0x80) { if(graphic & 0x80) {
reinterpret_cast<uint8_t *>(&pixel_pointer_[c])[0] |= (graphics_carry_&1); pixel_pointer_[0] = graphics_carry_;
pixel_pointer_++;
} }
graphics_carry_ = graphic >> 6; int mask = 0x01;
for(int p = 0; p < 12; p += 2) {
pixel_pointer_[p] = graphic & mask;
pixel_pointer_[p+1] = graphic & mask;
mask <<= 1;
} }
break; pixel_pointer_[12] = graphic & 0x40;
pixel_pointer_ += 13;
if(!(graphic & 0x80)) {
pixel_pointer_[0] = graphic & 0x40;
pixel_pointer_++;
}
graphics_carry_ = graphic & 0x40;
}
} break;
} }
if(ending_column >= 40) { if(ending_column >= 40) {
output_data(80); output_data_to_column(40);
} }
} else { } else {
if(ending_column >= 40) { if(ending_column >= 40) {
crt_->output_blank(280); crt_->output_blank(560);
} }
} }
} }
@ -169,13 +206,13 @@ template <class BusHandler> class Video: public VideoBase {
const int first_blank_start = std::max(40, column_); const int first_blank_start = std::max(40, column_);
const int first_blank_end = std::min(first_sync_column, ending_column); const int first_blank_end = std::min(first_sync_column, ending_column);
if(first_blank_end > first_blank_start) { if(first_blank_end > first_blank_start) {
crt_->output_blank(static_cast<unsigned int>(first_blank_end - first_blank_start) * 7); crt_->output_blank(static_cast<unsigned int>(first_blank_end - first_blank_start) * 14);
} }
const int sync_start = std::max(first_sync_column, column_); const int sync_start = std::max(first_sync_column, column_);
const int sync_end = std::min(first_sync_column + 4, ending_column); const int sync_end = std::min(first_sync_column + 4, ending_column);
if(sync_end > sync_start) { if(sync_end > sync_start) {
crt_->output_sync(static_cast<unsigned int>(sync_end - sync_start) * 7); crt_->output_sync(static_cast<unsigned int>(sync_end - sync_start) * 14);
} }
int second_blank_start; int second_blank_start;
@ -183,7 +220,7 @@ template <class BusHandler> class Video: public VideoBase {
const int colour_burst_start = std::max(first_sync_column + 4, column_); const int colour_burst_start = std::max(first_sync_column + 4, column_);
const int colour_burst_end = std::min(first_sync_column + 7, ending_column); const int colour_burst_end = std::min(first_sync_column + 7, ending_column);
if(colour_burst_end > colour_burst_start) { if(colour_burst_end > colour_burst_start) {
crt_->output_default_colour_burst(static_cast<unsigned int>(colour_burst_end - colour_burst_start) * 7); crt_->output_default_colour_burst(static_cast<unsigned int>(colour_burst_end - colour_burst_start) * 14);
} }
second_blank_start = std::max(first_sync_column + 7, column_); second_blank_start = std::max(first_sync_column + 7, column_);
@ -192,7 +229,7 @@ template <class BusHandler> class Video: public VideoBase {
} }
if(ending_column > second_blank_start) { if(ending_column > second_blank_start) {
crt_->output_blank(static_cast<unsigned int>(ending_column - second_blank_start) * 7); crt_->output_blank(static_cast<unsigned int>(ending_column - second_blank_start) * 14);
} }
} }
@ -204,7 +241,7 @@ template <class BusHandler> class Video: public VideoBase {
// Add an extra half a colour cycle of blank; this isn't counted in the run_for // Add an extra half a colour cycle of blank; this isn't counted in the run_for
// count explicitly but is promised. // count explicitly but is promised.
crt_->output_blank(1); crt_->output_blank(2);
} }
} }
} }
@ -261,8 +298,10 @@ template <class BusHandler> class Video: public VideoBase {
const int flash_length = 8406; const int flash_length = 8406;
BusHandler &bus_handler_; BusHandler &bus_handler_;
void output_data(unsigned int length) { void output_data_to_column(int column) {
crt_->output_data((length*7)/2, length); int length = column - pixel_pointer_column_;
crt_->output_data(static_cast<unsigned int>(length*14), static_cast<unsigned int>(length * (pixels_are_high_density_ ? 14 : 7)));
pixel_pointer_ = nullptr;
} }
}; };