Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-09-17 08:02:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Slightly rework desktop/GLES context creation

Browse source
This commit is contained in:
Stenzek 2020-02-06 20:55:11 +09:00
parent 8654778298
commit 8d9ce82281
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/duckstation-qt/opengldisplaywindow.cpp
View file

@ -232,14 +232,10 @@ bool OpenGLDisplayWindow::createDeviceContext(QThread* worker_thread, bool debug
surface_format.setVersion(major, minor); surface_format.setVersion(major, minor);
m_gl_context->setFormat(surface_format); m_gl_context->setFormat(surface_format);
if (m_gl_context->create()) if (m_gl_context->create())
{
m_is_gles = m_gl_context->isOpenGLES();
Log_InfoPrintf("Got a %s %d.%d context", m_is_gles ? "OpenGL ES" : "desktop OpenGL", major, minor);
break; break;
}
} }
if (!m_gl_context) if (!m_gl_context->isValid())
{ {
// try forcing ES // try forcing ES
surface_format.setRenderableType(QSurfaceFormat::OpenGLES); surface_format.setRenderableType(QSurfaceFormat::OpenGLES);
@ -252,11 +248,7 @@ bool OpenGLDisplayWindow::createDeviceContext(QThread* worker_thread, bool debug
surface_format.setVersion(major, minor); surface_format.setVersion(major, minor);
m_gl_context->setFormat(surface_format); m_gl_context->setFormat(surface_format);
if (m_gl_context->create()) if (m_gl_context->create())
{
Log_InfoPrintf("Got a OpenGL ES %d.%d context", major, minor);
m_is_gles = true;
break; break;
}
} }
} }
@ -267,6 +259,11 @@ bool OpenGLDisplayWindow::createDeviceContext(QThread* worker_thread, bool debug
return false; return false;
} }
surface_format = m_gl_context->format();
m_is_gles = m_gl_context->isOpenGLES();
Log_InfoPrintf("Got a %s %d.%d context", (m_is_gles ? "OpenGL ES" : "desktop OpenGL"), surface_format.majorVersion(),
surface_format.minorVersion());
if (!m_gl_context->makeCurrent(this)) if (!m_gl_context->makeCurrent(this))
{ {
Log_ErrorPrintf("Failed to make GL context current on UI thread"); Log_ErrorPrintf("Failed to make GL context current on UI thread");