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

Makes an attempt at pre-emptive line buffer clearing.

Browse Source
This commit is contained in:
Thomas Harte 2018-11-14 21:19:14 -05:00
parent 91b19c5c70
commit 87df8b9e85
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Outputs/OpenGL/ScanTarget.cpp
View File

@ -329,28 +329,7 @@ template <typename T> void ScanTarget::patch_buffer(const T &array, GLuint targe
memcpy(&destination[0], &array[submit_pointer+1], end_length); memcpy(&destination[0], &array[submit_pointer+1], end_length);
memcpy(&destination[end_length], &array[0], buffer_length - end_length); memcpy(&destination[end_length], &array[0], buffer_length - end_length);
/* if(read_pointer < submit_pointer) { // Flush and unmap the buffer.
// Submit the direct region from the submit pointer to the read pointer.
const size_t offset = read_pointer * sizeof(array[0]);
const size_t length = (submit_pointer - read_pointer) * sizeof(array[0]);
glBufferSubData(GL_ARRAY_BUFFER, GLintptr(offset), GLsizeiptr(length), &array[read_pointer]);
} else {
// The circular buffer wrapped around; submit the data from the read pointer to the end of
// the buffer and from the start of the buffer to the submit pointer.
const size_t offset = read_pointer * sizeof(array[0]);
const size_t end_length = (array.size() - read_pointer) * sizeof(array[0]);
const size_t start_length = submit_pointer * sizeof(array[0]);
memcpy(&destination[offset], &array[read_pointer], end_length);
memcpy(&destination[0], &array[0], start_length);
glFlushMappedBufferRange(GL_ARRAY_BUFFER, GLintptr(offset), GLsizeiptr(end_length));
glFlushMappedBufferRange(GL_ARRAY_BUFFER, 0, GLsizeiptr(start_length));*/
// }
// Unmap the buffer.
// glBufferSubData(GL_ARRAY_BUFFER, GLintptr(offset), GLsizeiptr(length), &array[read_pointer]);
glFlushMappedBufferRange(GL_ARRAY_BUFFER, 0, GLsizeiptr(buffer_size)); glFlushMappedBufferRange(GL_ARRAY_BUFFER, 0, GLsizeiptr(buffer_size));
glUnmapBuffer(GL_ARRAY_BUFFER); glUnmapBuffer(GL_ARRAY_BUFFER);
} }
@ -457,6 +436,27 @@ void ScanTarget::draw(bool synchronous, int output_width, int output_height) {
// Push new input to the unprocessed line buffer. // Push new input to the unprocessed line buffer.
if(new_scans) { if(new_scans) {
unprocessed_line_texture_.bind_framebuffer(); unprocessed_line_texture_.bind_framebuffer();
// Clear newly-touched lines; that is everything from (read+1) to submit.
const uint16_t first_line_to_clear = (read_pointers.line+1)%line_buffer_.size();
const uint16_t final_line_to_clear = submit_pointers.line;
if(first_line_to_clear != final_line_to_clear) {
glEnable(GL_SCISSOR_TEST);
if(first_line_to_clear < final_line_to_clear) {
glScissor(0, first_line_to_clear, unprocessed_line_texture_.get_width(), final_line_to_clear - first_line_to_clear);
glClear(GL_COLOR_BUFFER_BIT);
} else {
glScissor(0, 0, unprocessed_line_texture_.get_width(), final_line_to_clear);
glClear(GL_COLOR_BUFFER_BIT);
glScissor(0, first_line_to_clear, unprocessed_line_texture_.get_width(), 2048 - first_line_to_clear);
glClear(GL_COLOR_BUFFER_BIT);
}
glDisable(GL_SCISSOR_TEST);
}
// Apply new spans.
glBindVertexArray(scan_vertex_array_); glBindVertexArray(scan_vertex_array_);
input_shader_->bind(); input_shader_->bind();
glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, GLsizei(new_scans)); glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, GLsizei(new_scans));
@ -467,8 +467,6 @@ void ScanTarget::draw(bool synchronous, int output_width, int output_height) {
glViewport(0, 0, (GLsizei)output_width, (GLsizei)output_height); glViewport(0, 0, (GLsizei)output_width, (GLsizei)output_height);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
// unprocessed_line_texture_.draw(1.0f);
// Output all lines except the one currently being worked on. // Output all lines except the one currently being worked on.
glBindVertexArray(line_vertex_array_); glBindVertexArray(line_vertex_array_);
output_shader_->bind(); output_shader_->bind();