Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 1d268c5b authored by Dmitry Kazakov's avatar Dmitry Kazakov

Don't probe openGL renderer that are already known not to work

parent 1f6f6d61
......@@ -712,13 +712,6 @@ KisOpenGL::RendererConfig KisOpenGL::selectSurfaceConfig(KisOpenGL::OpenGLRender
QVector<KisConfig::RootSurfaceFormat> formatSymbols({KisConfig::BT709_G22});
#endif
QVector<RendererConfig> preferredConfigs;
for (auto it = renderersToTest.begin(); it != renderersToTest.end(); ++it) {
Q_FOREACH (const KisConfig::RootSurfaceFormat formatSymbol, formatSymbols) {
preferredConfigs << generateSurfaceConfig(it.key(), formatSymbol, enableDebug);
}
}
KisOpenGL::RendererConfig defaultConfig = generateSurfaceConfig(KisOpenGL::RendererAuto,
KisConfig::BT709_G22, false);
Info info = KisOpenGLModeProber::instance()->probeFormat(defaultConfig);
......@@ -775,6 +768,7 @@ KisOpenGL::RendererConfig KisOpenGL::selectSurfaceConfig(KisOpenGL::OpenGLRender
info = KisOpenGLModeProber::instance()->
probeFormat(generateSurfaceConfig(it.key(),
KisConfig::BT709_G22, false));
*it = info;
}
compareOp.setOpenGLBlacklisted(
......@@ -803,6 +797,15 @@ KisOpenGL::RendererConfig KisOpenGL::selectSurfaceConfig(KisOpenGL::OpenGLRender
preferredByQt = RendererDesktopGL;
}
QVector<RendererConfig> preferredConfigs;
for (auto it = renderersToTest.begin(); it != renderersToTest.end(); ++it) {
// if default mode of the renderer doesn't work, then custom won't either
if (!it.value()) continue;
Q_FOREACH (const KisConfig::RootSurfaceFormat formatSymbol, formatSymbols) {
preferredConfigs << generateSurfaceConfig(it.key(), formatSymbol, enableDebug);
}
}
std::stable_sort(preferredConfigs.begin(), preferredConfigs.end(), compareOp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment