Commit 3eb76ed6 authored by David Edmundson's avatar David Edmundson

Only assert on broken GL when we're rendering using GL

Test Plan: set backend. Didn't get an error message

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D8012
parent e79bf9e1
......@@ -57,15 +57,17 @@ DesktopView::DesktopView(Plasma::Corona *corona, QScreen *targetScreen)
QObject::connect(corona, &Plasma::Corona::kPackageChanged,
this, &DesktopView::coronaPackageChanged);
connect(this, &DesktopView::sceneGraphInitialized, this,
[this, corona]() {
// check whether the GL Context supports OpenGL
// Note: hasOpenGLShaderPrograms is broken, see QTBUG--39730
if (!QOpenGLShaderProgram::hasOpenGLShaderPrograms(openglContext())) {
qWarning() << "GLSL not available, Plasma won't be functional";
QMetaObject::invokeMethod(corona, "showOpenGLNotCompatibleWarning", Qt::QueuedConnection);
}
}, Qt::DirectConnection);
if (QQuickWindow::sceneGraphBackend() != QLatin1String("software")) {
connect(this, &DesktopView::sceneGraphInitialized, this,
[this, corona]() {
// check whether the GL Context supports OpenGL
// Note: hasOpenGLShaderPrograms is broken, see QTBUG--39730
if (!QOpenGLShaderProgram::hasOpenGLShaderPrograms(openglContext())) {
qWarning() << "GLSL not available, Plasma won't be functional";
QMetaObject::invokeMethod(corona, "showOpenGLNotCompatibleWarning", Qt::QueuedConnection);
}
}, Qt::DirectConnection);
}
}
DesktopView::~DesktopView()
......
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