Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

GL: Fix bug where we could crash if a readback happened at the same time as a buffer expansion.

Browse source
This commit is contained in:
Henrik Rydgård 2018-03-14 00:06:38 +01:00
parent 7a8310ae5e
commit ba5208efaa
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/native/thin3d/GLRenderManager.cpp
View file

@ -455,15 +455,18 @@ void GLRenderManager::Run(int frame) {
BeginSubmitFrame(frame);
FrameData &frameData = frameData_[frame];
for (auto iter : frameData.activePushBuffers) {
iter->Flush();
iter->UnmapDevice();
}
auto &stepsOnThread = frameData_[frame].steps;
auto &initStepsOnThread = frameData_[frame].initSteps;
// queueRunner_.LogSteps(stepsOnThread);
queueRunner_.RunInitSteps(initStepsOnThread);
// Run this after RunInitSteps so any fresh GLRBuffers for the pushbuffers can get created.
for (auto iter : frameData.activePushBuffers) {
iter->Flush();
iter->UnmapDevice();
}
queueRunner_.RunSteps(stepsOnThread);
stepsOnThread.clear();
initStepsOnThread.clear();
@ -601,6 +604,7 @@ void GLPushBuffer::Flush() {
if (!buffers_[buf_].deviceMemory && writePtr_) {
auto &info = buffers_[buf_];
if (info.flushOffset != 0) {
assert(info.buffer->buffer);
glBindBuffer(target_, info.buffer->buffer);
glBufferSubData(target_, 0, info.flushOffset, info.localMemory);
}