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

Reduced Oric video to single nibble constants. Removed attempt at asynchronous flush as no longer required.

Browse Source
This commit is contained in:
Thomas Harte 2016-12-10 14:17:46 -05:00
parent 580f347727
commit 0e71802b92
3 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Machines/Oric/Video.cpp
View File

@ -95,8 +95,8 @@ void VideoOutput::run_for_cycles(int number_of_cycles)
// this is a pixel line // this is a pixel line
if(!h_counter) if(!h_counter)
{ {
ink_ = 0xff; ink_ = 0xf;
paper_ = 0x00; paper_ = 0x0;
use_alternative_character_set_ = use_double_height_characters_ = blink_text_ = false; use_alternative_character_set_ = use_double_height_characters_ = blink_text_ = false;
set_character_set_base_address(); set_character_set_base_address();
pixel_target_ = (uint16_t *)crt_->allocate_write_area(240); pixel_target_ = (uint16_t *)crt_->allocate_write_area(240);
@ -133,7 +133,7 @@ void VideoOutput::run_for_cycles(int number_of_cycles)
pixels = ram_[character_set_base_address_ + (control_byte&127) * 8 + line]; pixels = ram_[character_set_base_address_ + (control_byte&127) * 8 + line];
} }
uint8_t inverse_mask = (control_byte & 0x80) ? 0x77 : 0x00; uint8_t inverse_mask = (control_byte & 0x80) ? 0x7 : 0x0;
pixels &= blink_mask; pixels &= blink_mask;
if(control_byte & 0x60) if(control_byte & 0x60)
@ -143,13 +143,13 @@ void VideoOutput::run_for_cycles(int number_of_cycles)
uint16_t colours[2]; uint16_t colours[2];
if(output_device_ == Outputs::CRT::Monitor) if(output_device_ == Outputs::CRT::Monitor)
{ {
colours[0] = (uint8_t)((paper_ ^ inverse_mask) & 0xf); colours[0] = (uint8_t)(paper_ ^ inverse_mask);
colours[1] = (uint8_t)((ink_ ^ inverse_mask) & 0xf); colours[1] = (uint8_t)(ink_ ^ inverse_mask);
} }
else else
{ {
colours[0] = colour_forms_[(paper_ ^ inverse_mask)&0xf]; colours[0] = colour_forms_[paper_ ^ inverse_mask];
colours[1] = colour_forms_[(ink_ ^ inverse_mask)&0xf]; colours[1] = colour_forms_[ink_ ^ inverse_mask];
} }
pixel_target_[0] = colours[(pixels >> 5)&1]; pixel_target_[0] = colours[(pixels >> 5)&1];
pixel_target_[1] = colours[(pixels >> 4)&1]; pixel_target_[1] = colours[(pixels >> 4)&1];
@ -163,14 +163,14 @@ void VideoOutput::run_for_cycles(int number_of_cycles)
{ {
switch(control_byte & 0x1f) switch(control_byte & 0x1f)
{ {
case 0x00: ink_ = 0x00; break; case 0x00: ink_ = 0x0; break;
case 0x01: ink_ = 0x44; break; case 0x01: ink_ = 0x4; break;
case 0x02: ink_ = 0x22; break; case 0x02: ink_ = 0x2; break;
case 0x03: ink_ = 0x66; break; case 0x03: ink_ = 0x6; break;
case 0x04: ink_ = 0x11; break; case 0x04: ink_ = 0x1; break;
case 0x05: ink_ = 0x55; break; case 0x05: ink_ = 0x5; break;
case 0x06: ink_ = 0x33; break; case 0x06: ink_ = 0x3; break;
case 0x07: ink_ = 0x77; break; case 0x07: ink_ = 0x7; break;
case 0x08: case 0x09: case 0x0a: case 0x0b: case 0x08: case 0x09: case 0x0a: case 0x0b:
case 0x0c: case 0x0d: case 0x0e: case 0x0f: case 0x0c: case 0x0d: case 0x0e: case 0x0f:
@ -180,14 +180,14 @@ void VideoOutput::run_for_cycles(int number_of_cycles)
set_character_set_base_address(); set_character_set_base_address();
break; break;
case 0x10: paper_ = 0x00; break; case 0x10: paper_ = 0x0; break;
case 0x11: paper_ = 0x44; break; case 0x11: paper_ = 0x4; break;
case 0x12: paper_ = 0x22; break; case 0x12: paper_ = 0x2; break;
case 0x13: paper_ = 0x66; break; case 0x13: paper_ = 0x6; break;
case 0x14: paper_ = 0x11; break; case 0x14: paper_ = 0x1; break;
case 0x15: paper_ = 0x55; break; case 0x15: paper_ = 0x5; break;
case 0x16: paper_ = 0x33; break; case 0x16: paper_ = 0x3; break;
case 0x17: paper_ = 0x77; break; case 0x17: paper_ = 0x7; break;
case 0x18: case 0x19: case 0x1a: case 0x1b: case 0x18: case 0x19: case 0x1a: case 0x1b:
case 0x1c: case 0x1d: case 0x1e: case 0x1f: case 0x1c: case 0x1d: case 0x1e: case 0x1f:
@ -202,7 +202,7 @@ void VideoOutput::run_for_cycles(int number_of_cycles)
pixel_target_[0] = pixel_target_[1] = pixel_target_[0] = pixel_target_[1] =
pixel_target_[2] = pixel_target_[3] = pixel_target_[2] = pixel_target_[3] =
pixel_target_[4] = pixel_target_[5] = pixel_target_[4] = pixel_target_[5] =
(output_device_ == Outputs::CRT::Monitor) ? (paper_ ^ inverse_mask)&0xf : colour_forms_[(paper_ ^ inverse_mask)&0xf]; (output_device_ == Outputs::CRT::Monitor) ? paper_ ^ inverse_mask : colour_forms_[paper_ ^ inverse_mask];
} }
} }
if(pixel_target_) pixel_target_ += 6; if(pixel_target_) pixel_target_ += 6;

14
Outputs/CRT/Internals/ArrayBuilder.cpp
View File

@ -78,7 +78,7 @@ ArrayBuilder::Submission ArrayBuilder::submit()
} }
ArrayBuilder::Buffer::Buffer(size_t size, std::function<void(bool is_input, uint8_t *, size_t)> submission_function) : ArrayBuilder::Buffer::Buffer(size_t size, std::function<void(bool is_input, uint8_t *, size_t)> submission_function) :
is_full(false), was_reset(false), is_full(false),
submission_function_(submission_function), submission_function_(submission_function),
allocated_data(0), flushed_data(0), submitted_data(0) allocated_data(0), flushed_data(0), submitted_data(0)
{ {
@ -137,14 +137,6 @@ void ArrayBuilder::Buffer::flush()
} }
flushed_data = allocated_data; flushed_data = allocated_data;
if(was_reset)
{
allocated_data = 0;
flushed_data = 0;
submitted_data = 0;
was_reset = false;
}
} }
size_t ArrayBuilder::Buffer::submit(bool is_input) size_t ArrayBuilder::Buffer::submit(bool is_input)
@ -171,6 +163,8 @@ void ArrayBuilder::Buffer::bind()
void ArrayBuilder::Buffer::reset() void ArrayBuilder::Buffer::reset()
{ {
was_reset = true;
is_full = false; is_full = false;
allocated_data = 0;
flushed_data = 0;
submitted_data = 0;
} }

2
Outputs/CRT/Internals/ArrayBuilder.hpp
View File

@ -82,7 +82,7 @@ class ArrayBuilder {
void reset(); void reset();
private: private:
bool is_full, was_reset; bool is_full;
GLuint buffer; GLuint buffer;
std::function<void(bool is_input, uint8_t *, size_t)> submission_function_; std::function<void(bool is_input, uint8_t *, size_t)> submission_function_;
std::vector<uint8_t> data; std::vector<uint8_t> data;