1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add QWidgetPrivate::rhi() helper method

Browse Source 
For accessing the RHI managed by the widget compositing machinery.

Pick-to: 6.6 6.5
Change-Id: Ia3c1227cc2d9cfebe95611cad3dbcd7aa6f6f8c7
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit f451b01791536fede40c8d4fb90799c2e23e9386)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-02-29 13:21:25 +01:00 committed by Qt Cherry-pick Bot
parent 0c519efa11
commit 9dbb295279
5 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openglwidgets/qopenglwidget.cpp
View File

@ -784,9 +784,7 @@ void QOpenGLWidgetPrivate::ensureRhiDependentResources()
{
Q_Q(QOpenGLWidget);
QRhi *rhi = nullptr;
if (QWidgetRepaintManager *repaintManager = QWidgetPrivate::get(q->window())->maybeRepaintManager())
rhi = repaintManager->rhi();
QRhi *rhi = QWidgetPrivate::rhi();
// If there is no rhi, because we are completely offscreen, then there's no wrapperTexture either
if (rhi && rhi->backend() == QRhi::OpenGLES2) {
@ -832,7 +830,6 @@ void QOpenGLWidgetPrivate::initialize()
// If no global shared context get our toplevel's context with which we
// will share in order to make the texture usable by the underlying window's backingstore.
QWidget *tlw = q->window();
QWidgetPrivate *tlwd = get(tlw);
// Do not include the sample count. Requesting a multisampled context is not necessary
// since we render into an FBO, never to an actual surface. What's more, attempting to
@ -841,9 +838,7 @@ void QOpenGLWidgetPrivate::initialize()
requestedSamples = requestedFormat.samples();
requestedFormat.setSamples(0);
QRhi *rhi = nullptr;
if (QWidgetRepaintManager *repaintManager = tlwd->maybeRepaintManager())
rhi = repaintManager->rhi();
QRhi *rhi = QWidgetPrivate::rhi();
// Could be that something else already initialized the window with some
// other graphics API for the QRhi, that's not good.
@ -1718,8 +1713,8 @@ bool QOpenGLWidget::event(QEvent *e)
if (!QCoreApplication::testAttribute(Qt::AA_ShareOpenGLContexts))
d->reset();
}
if (QWidgetRepaintManager *repaintManager = QWidgetPrivate::get(window())->maybeRepaintManager()) {
if (!d->initialized && !size().isEmpty() && repaintManager->rhi()) {
if (d->rhi()) {
if (!d->initialized && !size().isEmpty()) {
d->initialize();
if (d->initialized) {
d->recreateFbos();

9
src/widgets/kernel/qrhiwidget.cpp
View File

@ -475,14 +475,7 @@ void QRhiWidgetPrivate::releaseResources()
void QRhiWidgetPrivate::ensureRhi()
{
Q_Q(QRhiWidget);
// the QRhi and infrastructure belongs to the top-level widget, not to this widget
QWidget *tlw = q->window();
QWidgetPrivate *wd = get(tlw);
QRhi *currentRhi = nullptr;
if (QWidgetRepaintManager *repaintManager = wd->maybeRepaintManager())
currentRhi = repaintManager->rhi();
QRhi *currentRhi = QWidgetPrivate::rhi();
if (currentRhi && currentRhi->backend() != QBackingStoreRhiSupport::apiToRhiBackend(config.api())) {
qWarning("The top-level window is already using another graphics API for composition, "
"'%s' is not compatible with this widget",

8
src/widgets/kernel/qwidget.cpp
View File

@ -1029,6 +1029,14 @@ void QWidgetPrivate::createRecursively()
}
}
QRhi *QWidgetPrivate::rhi() const
{
if (QWidgetRepaintManager *repaintManager = maybeRepaintManager())
return repaintManager->rhi();
else
return nullptr;
}
/*!
\internal
Returns the closest parent widget that has a QWindow window handle

2
src/widgets/kernel/qwidget_p.h
View File

@ -221,6 +221,8 @@ public:
void setSharedPainter(QPainter *painter);
QWidgetRepaintManager *maybeRepaintManager() const;
QRhi *rhi() const;
enum class WindowHandleMode {
Direct,
Closest,

9
tests/manual/rhi/rhiwidgetproto/rhiwidget.cpp
View File

@ -155,14 +155,7 @@ QPlatformBackingStoreRhiConfig QRhiWidgetPrivate::rhiConfig() const
void QRhiWidgetPrivate::ensureRhi()
{
Q_Q(QRhiWidget);
// the QRhi and infrastructure belongs to the top-level widget, not to this widget
QWidget *tlw = q->window();
QWidgetPrivate *wd = get(tlw);
QRhi *currentRhi = nullptr;
if (QWidgetRepaintManager *repaintManager = wd->maybeRepaintManager())
currentRhi = repaintManager->rhi();
QRhi *currentRhi = QWidgetPrivate::rhi();
if (currentRhi && currentRhi->backend() != QBackingStoreRhiSupport::apiToRhiBackend(config.api())) {
qWarning("The top-level window is already using another graphics API for composition, "
"'%s' is not compatible with this widget",