6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 18:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Connects up the necessary recording to use intermediate composite buffers.

Browse Source
This commit is contained in:
Thomas Harte 2018-11-11 15:20:18 -05:00
parent be12d78c83
commit 0ba3ae53ab
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Outputs/OpenGL/ScanTarget.cpp
View File

@ -105,7 +105,7 @@ Outputs::Display::ScanTarget::Scan *ScanTarget::begin_scan() {
write_pointers_.scan_buffer = next_write_pointer; write_pointers_.scan_buffer = next_write_pointer;
// Fill in extra OpenGL-specific details. // Fill in extra OpenGL-specific details.
result->composite_y = 0; // TODO. result->composite_y = write_pointers_.composite_y;
vended_scan_ = result; vended_scan_ = result;
return static_cast<Outputs::Display::ScanTarget::Scan *>(result); return static_cast<Outputs::Display::ScanTarget::Scan *>(result);
@ -180,6 +180,33 @@ void ScanTarget::submit() {
} }
void ScanTarget::announce(Event event, uint16_t x, uint16_t y) { void ScanTarget::announce(Event event, uint16_t x, uint16_t y) {
switch(event) {
default: break;
case ScanTarget::Event::BeginHorizontalRetrace:
if(active_composite_line_) {
active_composite_line_->end_points[1].x = x;
active_composite_line_->end_points[1].y = y;
active_composite_line_ = nullptr;
}
break;
case ScanTarget::Event::EndHorizontalRetrace: {
const auto read_pointers = read_pointers_.load();
// Attempt to allocate a new line; note allocation failure if necessary.
const auto next_composite_y = uint16_t((write_pointers_.composite_y + 1) % CompositeLineBufferHeight);
// Check whether that's too many.
if(next_composite_y == read_pointers.composite_y) {
allocation_has_failed_ = true;
} else {
write_pointers_.composite_y = next_composite_y;
active_composite_line_ = &composite_line_buffer_[size_t(write_pointers_.composite_y)];
active_composite_line_->end_points[0].x = x;
active_composite_line_->end_points[0].y = y;
active_composite_line_->composite_y = write_pointers_.composite_y;
}
} break;
}
} }
void ScanTarget::draw() { void ScanTarget::draw() {

1
Outputs/OpenGL/ScanTarget.hpp
View File

@ -80,6 +80,7 @@ class ScanTarget: public Outputs::Display::ScanTarget {
std::array<CompositeLine, 2048> composite_line_buffer_; std::array<CompositeLine, 2048> composite_line_buffer_;
TextureTarget composite_line_texture_; TextureTarget composite_line_texture_;
GLuint composite_line_vertex_array_ = 0; GLuint composite_line_vertex_array_ = 0;
CompositeLine *active_composite_line_ = nullptr;
// Uses a texture to vend write areas. // Uses a texture to vend write areas.
std::vector<uint8_t> write_area_texture_; std::vector<uint8_t> write_area_texture_;