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

Ensured I don't interrupt triangle strips for the purpose of glDrawArrays.

Browse Source
This commit is contained in:
Thomas Harte 2016-03-18 21:28:53 -04:00
parent 620257e29e
commit 0b1c9fb291
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Outputs/CRT/Internals/CRTOpenGL.cpp
View File

@ -99,6 +99,7 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out
glBufferData(GL_ARRAY_BUFFER, InputVertexBufferDataSize, NULL, GL_STREAM_DRAW); glBufferData(GL_ARRAY_BUFFER, InputVertexBufferDataSize, NULL, GL_STREAM_DRAW);
_output_buffer_data = new uint8_t[InputVertexBufferDataSize]; _output_buffer_data = new uint8_t[InputVertexBufferDataSize];
_output_buffer_data_pointer = 0; _output_buffer_data_pointer = 0;
glBindVertexArray(output_vertex_array); glBindVertexArray(output_vertex_array);
prepare_output_vertex_array(); prepare_output_vertex_array();
@ -188,8 +189,6 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out
// upload if required // upload if required
if(_run_builders[run]->amount_of_data != _run_builders[run]->amount_of_uploaded_data) if(_run_builders[run]->amount_of_data != _run_builders[run]->amount_of_uploaded_data)
{ {
uint8_t *target = nullptr;
size_t start = (_run_builders[run]->start + _run_builders[run]->amount_of_uploaded_data) % InputVertexBufferDataSize; size_t start = (_run_builders[run]->start + _run_builders[run]->amount_of_uploaded_data) % InputVertexBufferDataSize;
size_t length = _run_builders[run]->amount_of_data + _run_builders[run]->amount_of_uploaded_data; size_t length = _run_builders[run]->amount_of_data + _run_builders[run]->amount_of_uploaded_data;
@ -201,17 +200,25 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out
glDeleteSync(_output_buffer_sync); glDeleteSync(_output_buffer_sync);
} }
_output_buffer_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); _output_buffer_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
target = (uint8_t *)glMapBufferRange(GL_ARRAY_BUFFER, 0, InputVertexBufferDataSize, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT); uint8_t *target = (uint8_t *)glMapBufferRange(GL_ARRAY_BUFFER, 0, InputVertexBufferDataSize, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
memcpy(&target[start], &_output_buffer_data[start], InputVertexBufferDataSize - start); if(target)
memcpy(target, _output_buffer_data, length - (InputVertexBufferDataSize - start)); {
size_t first_size = InputVertexBufferDataSize - start;
memcpy(&target[start], &_output_buffer_data[start], first_size);
memcpy(target, _output_buffer_data, length - first_size);
glUnmapBuffer(GL_ARRAY_BUFFER);
}
} }
else else
{ {
target = (uint8_t *)glMapBufferRange(GL_ARRAY_BUFFER, (GLintptr)start, (GLsizeiptr)length, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT); uint8_t *target = (uint8_t *)glMapBufferRange(GL_ARRAY_BUFFER, (GLintptr)start, (GLsizeiptr)length, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
memcpy(target, &_output_buffer_data[start], length); if(target)
{
memcpy(target, &_output_buffer_data[start], length);
glUnmapBuffer(GL_ARRAY_BUFFER);
}
} }
glUnmapBuffer(GL_ARRAY_BUFFER);
_run_builders[run]->amount_of_uploaded_data = _run_builders[run]->amount_of_data; _run_builders[run]->amount_of_uploaded_data = _run_builders[run]->amount_of_data;
} }

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

@ -48,7 +48,7 @@ const int IntermediateBufferWidth = 2048;
const int IntermediateBufferHeight = 2048; const int IntermediateBufferHeight = 2048;
// Some internal // Some internal
const GLsizeiptr InputVertexBufferDataSize = 256 * 1024; const GLsizeiptr InputVertexBufferDataSize = 262080; // a multiple of 6 * OutputVertexSize
// Runs are divided discretely by vertical syncs in order to put a usable bounds on the uniform used to track // Runs are divided discretely by vertical syncs in order to put a usable bounds on the uniform used to track