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

rhi: Move generic setup code out of create()

Browse Source 
Change-Id: I5222dd5479fe5c23b20bd08a2908a85be4d25e45
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2023-04-11 10:05:09 +02:00
parent a0675562ea
commit 9807af617d
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/rhi/qrhi.cpp
View File

@ -5507,6 +5507,22 @@ QRhi::~QRhi()
delete d; delete d;
} }
void QRhiImplementation::prepareForCreate(QRhi *rhi, QRhi::Implementation impl, QRhi::Flags flags)
{
q = rhi;
// Play nice with QSG_INFO since that is still the most commonly used
// way to get graphics info printed from Qt Quick apps, and the Quick
// scenegraph is our primary user.
if (qEnvironmentVariableIsSet("QSG_INFO"))
const_cast<QLoggingCategory &>(QRHI_LOG_INFO()).setEnabled(QtDebugMsg, true);
debugMarkers = flags.testFlag(QRhi::EnableDebugMarkers);
implType = impl;
implThread = QThread::currentThread();
}
/*! /*!
\return a new QRhi instance with a backend for the graphics API specified \return a new QRhi instance with a backend for the graphics API specified
by \a impl with the specified \a flags. by \a impl with the specified \a flags.
@ -5594,21 +5610,9 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh
} }
if (r->d) { if (r->d) {
r->d->q = r.get(); r->d->prepareForCreate(r.get(), impl, flags);
if (r->d->create(flags))
// Play nice with QSG_INFO since that is still the most commonly used
// way to get graphics info printed from Qt Quick apps, and the Quick
// scenegraph is our primary user.
if (qEnvironmentVariableIsSet("QSG_INFO"))
const_cast<QLoggingCategory &>(QRHI_LOG_INFO()).setEnabled(QtDebugMsg, true);
r->d->debugMarkers = flags.testFlag(EnableDebugMarkers);
if (r->d->create(flags)) {
r->d->implType = impl;
r->d->implThread = QThread::currentThread();
return r.release(); return r.release();
}
} }
return nullptr; return nullptr;

2
src/gui/rhi/qrhi_p_p.h
View File

@ -140,6 +140,8 @@ public:
virtual QByteArray pipelineCacheData() = 0; virtual QByteArray pipelineCacheData() = 0;
virtual void setPipelineCacheData(const QByteArray &data) = 0; virtual void setPipelineCacheData(const QByteArray &data) = 0;
void prepareForCreate(QRhi *rhi, QRhi::Implementation impl, QRhi::Flags flags);
bool isCompressedFormat(QRhiTexture::Format format) const; bool isCompressedFormat(QRhiTexture::Format format) const;
void compressedFormatInfo(QRhiTexture::Format format, const QSize &size, void compressedFormatInfo(QRhiTexture::Format format, const QSize &size,
quint32 *bpl, quint32 *byteSize, quint32 *bpl, quint32 *byteSize,