yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[windowthumbnails] Guard against software QtQuick backend

Browse source 
If we are using the software renderer
QQuickWindow::createTextureFromNativeObject returns null. We already
checking for kwin using GL compositing so we can expand to check
QtQuick's usage.
This commit is contained in:
David Edmundson 2022-09-27 11:18:06 +01:00
parent 1a87e9c9ac
commit 50b4e988a4
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/scripting/windowthumbnailitem.cpp
View file

@ -164,11 +164,17 @@ void WindowThumbnailItem::updateFrameRenderingConnection()
return; return;
} }
if (Compositor::self()->backend()->compositingType() == OpenGLCompositing) { if (useGlThumbnails()) {
m_frameRenderingConnection = connect(Compositor::self()->scene(), &Scene::preFrameRender, this, &WindowThumbnailItem::updateOffscreenTexture); m_frameRenderingConnection = connect(Compositor::self()->scene(), &Scene::preFrameRender, this, &WindowThumbnailItem::updateOffscreenTexture);
} }
} }
bool WindowThumbnailItem::useGlThumbnails()
{
static bool qtQuickIsSoftware = QStringList({QStringLiteral("software"), QStringLiteral("softwarecontext")}).contains(QQuickWindow::sceneGraphBackend());
return Compositor::self()->backend()->compositingType() == OpenGLCompositing && !qtQuickIsSoftware;
}
QSize WindowThumbnailItem::sourceSize() const QSize WindowThumbnailItem::sourceSize() const
{ {
return m_sourceSize; return m_sourceSize;
@ -188,7 +194,7 @@ void WindowThumbnailItem::destroyOffscreenTexture()
if (!Compositor::compositing()) { if (!Compositor::compositing()) {
return; return;
} }
if (Compositor::self()->backend()->compositingType() != OpenGLCompositing) { if (!useGlThumbnails()) {
return; return;
} }

1
src/scripting/windowthumbnailitem.h
View file

@ -87,6 +87,7 @@ private:
void destroyOffscreenTexture(); void destroyOffscreenTexture();
void updateImplicitSize(); void updateImplicitSize();
void updateFrameRenderingConnection(); void updateFrameRenderingConnection();
static bool useGlThumbnails();
QSize m_sourceSize; QSize m_sourceSize;
QUuid m_wId; QUuid m_wId;