pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[qt] Set OGL v3.2 on startup.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2023-05-05 10:36:12 -03:00
parent 23ec8ec9f2
commit 1a1be81531
2 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qt/main.cpp
View file

@ -203,7 +203,6 @@ int main(int argc, char * argv[])
screenshotParams->m_dpiScale = FLAGS_dpi_scale;
}
QSurfaceFormat fmt;
fmt.setAlphaBufferSize(8);
fmt.setBlueBufferSize(8);
@ -215,20 +214,15 @@ int main(int argc, char * argv[])
fmt.setSwapInterval(1);
fmt.setDepthBufferSize(16);
// This is a workaround for some systems,
// including MacOs and older Linux distros, which rely on X.org and Mesa.
// Where somehow the driver itself doesn't
// make all the otherwise supported GLSL versions available by default
// and such requests are somehow disregarded at later stages of execution.
// This setting here will be potentially overwritten and overruled anyway,
// and only needed to ensure that we have the needed GLSL compiler available
// later when we need it.
if (app.platformName() == QString("xcb") ||
app.platformName() == QString("cocoa"))
// Set proper OGL version now (needed for "cocoa" or "xcb"), but have troubles with "wayland" devices.
// It will be resolved later in MapWidget::initializeGL when OGL context is available.
if (app.platformName() != QString("wayland"))
{
LOG(LINFO, ("Set default OGL version to 3.2"));
fmt.setProfile(QSurfaceFormat::CoreProfile);
fmt.setVersion(3, 2);
}
#ifdef ENABLE_OPENGL_DIAGNOSTICS
fmt.setOption(QSurfaceFormat::DebugContext);
#endif

26
qt/qt_common/map_widget.cpp
View file

@ -377,20 +377,22 @@ void MapWidget::initializeGL()
// TODO: Separate apiOpenGL3 from apiOpenGLES3, and use that for the currend shader code.
m_apiOpenGLES3 = true;
}
auto fmt = context()->format();
if (m_apiOpenGLES3)
{
fmt.setProfile(QSurfaceFormat::CoreProfile);
fmt.setVersion(3, 2);
}
else
{
fmt.setProfile(QSurfaceFormat::CompatibilityProfile);
fmt.setVersion(2, 1);
}
QSurfaceFormat::setDefaultFormat(fmt);
}
#endif
auto fmt = context()->format();
if (m_apiOpenGLES3)
{
fmt.setProfile(QSurfaceFormat::CoreProfile);
fmt.setVersion(3, 2);
}
else
{
fmt.setProfile(QSurfaceFormat::CompatibilityProfile);
fmt.setVersion(2, 1);
}
QSurfaceFormat::setDefaultFormat(fmt);
m_contextFactory.reset(new QtOGLContextFactory(context()));