ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Attempt to fix DisplayGL crash

This commit is contained in:
Vicki Pfau 2020-07-31 01:33:47 -07:00
parent 8a9a8859a6
commit 4807d68482
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/platform/qt/DisplayGL.cpp
View File

@ -487,8 +487,6 @@ void PainterGL::performDraw() {
m_backend->resized(m_backend, m_size.width() * r, m_size.height() * r);
if (m_buffer) {
m_backend->postFrame(m_backend, m_buffer);
m_free.append(m_buffer);
m_buffer = nullptr;
}
m_backend->drawFrame(m_backend);
m_painter.endNativePainting();
@ -498,7 +496,7 @@ void PainterGL::performDraw() {
}
void PainterGL::enqueue(const uint32_t* backing) {
m_mutex.lock();
QMutexLocker locker(&m_mutex);
uint32_t* buffer = nullptr;
if (backing) {
if (m_free.isEmpty()) {
@ -506,17 +504,17 @@ void PainterGL::enqueue(const uint32_t* backing) {
} else {
buffer = m_free.takeLast();
}
QSize size = m_context->screenDimensions();
memcpy(buffer, backing, size.width() * size.height() * BYTES_PER_PIXEL);
if (buffer) {
QSize size = m_context->screenDimensions();
memcpy(buffer, backing, size.width() * size.height() * BYTES_PER_PIXEL);
}
}
m_queue.enqueue(buffer);
m_mutex.unlock();
}
void PainterGL::dequeue() {
m_mutex.lock();
QMutexLocker locker(&m_mutex);
if (m_queue.isEmpty()) {
m_mutex.unlock();
return;
}
uint32_t* buffer = m_queue.dequeue();
@ -524,10 +522,7 @@ void PainterGL::dequeue() {
m_free.append(m_buffer);
m_buffer = nullptr;
}
if (buffer) {
m_buffer = buffer;
}
m_mutex.unlock();
m_buffer = buffer;
}
void PainterGL::dequeueAll() {