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

I don't think this is quite correct, but it's better.

Browse Source
This commit is contained in:
Thomas Harte 2016-03-18 21:14:06 -04:00
parent b074860031
commit 10bc33464d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,21 +185,24 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out
if(_run_builders[run]->amount_of_data > 0) if(_run_builders[run]->amount_of_data > 0)
{ {
// upload if required // upload if required
uint8_t *target = nullptr;
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)
{ {
target = (uint8_t *)glMapBufferRange(GL_ARRAY_BUFFER, 0, InputVertexBufferDataSize, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT); uint8_t *target = nullptr;
size_t start = _run_builders[run]->start + _run_builders[run]->amount_of_uploaded_data; 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;
if(start + length > InputVertexBufferDataSize) if(start + length > InputVertexBufferDataSize)
{ {
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); memcpy(&target[start], &_output_buffer_data[start], InputVertexBufferDataSize - start);
memcpy(target, _output_buffer_data, length - (InputVertexBufferDataSize - start)); memcpy(target, _output_buffer_data, length - (InputVertexBufferDataSize - start));
} }
else else
memcpy(&target[start], &_output_buffer_data[start], length); {
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);
}
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;