windows: Give up on SwitchableComposition
Opt out of switching between the normal and OpenGL based flush paths. Once a QOpenGLWidget or QQuickWidget becomes visible in a window, the window contents will be composed using OpenGL from that point on, even if said widgets become invisible afterwards. Now that Qt Creator does not rely on QQuickWidget the issue is less burning anyways. Task-number: QTBUG-68329 Change-Id: I177e6e6094ee06ea26d8d0343bd3d84aadfa5913 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>bb10
parent
c9d18d4a9c
commit
67c66c4ea4
|
|
@ -300,7 +300,7 @@ bool QWindowsIntegration::hasCapability(QPlatformIntegration::Capability cap) co
|
|||
case AllGLFunctionsQueryable:
|
||||
return true;
|
||||
case SwitchableWidgetComposition:
|
||||
return true;
|
||||
return false; // QTBUG-68329 QTBUG-53515 QTBUG-54734
|
||||
default:
|
||||
return QPlatformIntegration::hasCapability(cap);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1000,20 +1000,8 @@ static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget)
|
|||
static bool switchableWidgetComposition =
|
||||
QGuiApplicationPrivate::instance()->platformIntegration()
|
||||
->hasCapability(QPlatformIntegration::SwitchableWidgetComposition);
|
||||
if (!switchableWidgetComposition
|
||||
// The Windows compositor handles fullscreen OpenGL window specially. Besides
|
||||
// having trouble with popups, it also has issues with flip-flopping between
|
||||
// OpenGL-based and normal flushing. Therefore, stick with GL for fullscreen
|
||||
// windows (QTBUG-53515). Similary, translucent windows should not switch to
|
||||
// layered native windows (QTBUG-54734).
|
||||
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && !defined(Q_OS_WINCE)
|
||||
|| tlw->windowState().testFlag(Qt::WindowFullScreen)
|
||||
|| tlw->testAttribute(Qt::WA_TranslucentBackground)
|
||||
#endif
|
||||
)
|
||||
{
|
||||
if (!switchableWidgetComposition)
|
||||
return qt_dummy_platformTextureList();
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue