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

Ensures the line_allocation_has_failed_ condition can be exited.

Browse Source
This commit is contained in:
Thomas Harte 2019-02-21 22:30:41 -05:00
parent c0c4704419
commit de7ebead23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Outputs/OpenGL/ScanTarget.cpp
View File

@ -253,6 +253,8 @@ void ScanTarget::announce(Event event, bool is_visible, const Outputs::Display::
if(output_is_visible_ == is_visible) return; if(output_is_visible_ == is_visible) return;
if(is_visible) { if(is_visible) {
const auto read_pointers = read_pointers_.load();
// Commit the most recent line only if any scans fell on it. // Commit the most recent line only if any scans fell on it.
// Otherwise there's no point outputting it, it'll contribute nothing. // Otherwise there's no point outputting it, it'll contribute nothing.
if(provided_scans_) { if(provided_scans_) {
@ -263,8 +265,6 @@ void ScanTarget::announce(Event event, bool is_visible, const Outputs::Display::
is_first_in_frame_ = false; is_first_in_frame_ = false;
} }
const auto read_pointers = read_pointers_.load();
// Attempt to allocate a new line; note allocation failure if necessary. // Attempt to allocate a new line; note allocation failure if necessary.
const auto next_line = uint16_t((write_pointers_.line + 1) % LineBufferHeight); const auto next_line = uint16_t((write_pointers_.line + 1) % LineBufferHeight);
if(next_line == read_pointers.line) { if(next_line == read_pointers.line) {
@ -276,6 +276,16 @@ void ScanTarget::announce(Event event, bool is_visible, const Outputs::Display::
active_line_ = &line_buffer_[size_t(write_pointers_.line)]; active_line_ = &line_buffer_[size_t(write_pointers_.line)];
} }
provided_scans_ = 0; provided_scans_ = 0;
} else {
// Just check whether a new line is available now, if waiting.
if(line_allocation_has_failed_) {
const auto next_line = uint16_t((write_pointers_.line + 1) % LineBufferHeight);
if(next_line != read_pointers.line) {
line_allocation_has_failed_ = false;
write_pointers_.line = next_line;
active_line_ = &line_buffer_[size_t(write_pointers_.line)];
}
}
} }
if(active_line_) { if(active_line_) {
@ -551,7 +561,7 @@ void ScanTarget::draw(bool synchronous, int output_width, int output_height) {
// If this is start-of-frame, clear any untouched pixels and flush the stencil buffer // If this is start-of-frame, clear any untouched pixels and flush the stencil buffer
if(line_metadata_buffer_[start_line].is_first_in_frame) { if(line_metadata_buffer_[start_line].is_first_in_frame) {
if(stencil_is_valid_ && line_metadata_buffer_[start_line].previous_frame_was_complete) { if(stencil_is_valid_ && line_metadata_buffer_[start_line].previous_frame_was_complete) {
full_display_rectangle_.draw(0.0f, 0.0f, 0.0f); full_display_rectangle_.draw(1.0f, 0.0f, 0.0f);
} }
stencil_is_valid_ = true; stencil_is_valid_ = true;
test_gl(glClear, GL_STENCIL_BUFFER_BIT); test_gl(glClear, GL_STENCIL_BUFFER_BIT);