aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/quick/items/qquickrendercontrol.cpp2
-rw-r--r--src/quick/scenegraph/qsgrenderloop.cpp4
-rw-r--r--src/quick/scenegraph/qsgrhisupport.cpp52
-rw-r--r--src/quick/scenegraph/qsgrhisupport_p.h3
-rw-r--r--src/quick/scenegraph/qsgthreadedrenderloop.cpp4
5 files changed, 57 insertions, 8 deletions
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index d71af669f0..caf5a17dc6 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -666,7 +666,7 @@ bool QQuickRenderControlPrivate::initRhi()
void QQuickRenderControlPrivate::resetRhi()
{
- delete rhi;
+ QSGRhiSupport::instance()->destroyRhi(rhi);
rhi = nullptr;
delete offscreenSurface;
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index cf41868dc3..077814b1f4 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -376,7 +376,7 @@ void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window)
if (m_windows.size() == 0) {
rc->invalidate();
d->rhi = nullptr;
- delete rhi;
+ QSGRhiSupport::instance()->destroyRhi(rhi);
rhi = nullptr;
delete offscreenSurface;
offscreenSurface = nullptr;
@@ -402,7 +402,7 @@ void QSGGuiThreadRenderLoop::handleDeviceLoss()
it->rhiDeviceLost = true;
}
- delete rhi;
+ QSGRhiSupport::instance()->destroyRhi(rhi);
rhi = nullptr;
}
diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp
index 7d37d405b1..189cf0cba8 100644
--- a/src/quick/scenegraph/qsgrhisupport.cpp
+++ b/src/quick/scenegraph/qsgrhisupport.cpp
@@ -205,6 +205,11 @@ void QSGRhiSupport::applySettings()
// EnableProfiling + DebugMarkers
m_profile = uint(qEnvironmentVariableIntValue("QSG_RHI_PROFILE"));
+ // EnablePipelineCacheDataSave
+ m_pipelineCacheSave = qEnvironmentVariable("QSG_RHI_PIPELINE_CACHE_SAVE");
+
+ m_pipelineCacheLoad = qEnvironmentVariable("QSG_RHI_PIPELINE_CACHE_LOAD");
+
m_shaderEffectDebug = uint(qEnvironmentVariableIntValue("QSG_RHI_SHADEREFFECT_DEBUG"));
m_preferSoftwareRenderer = uint(qEnvironmentVariableIntValue("QSG_RHI_PREFER_SOFTWARE_RENDERER"));
@@ -215,8 +220,11 @@ void QSGRhiSupport::applySettings()
const QString backendName = rhiBackendName();
qCDebug(QSG_LOG_INFO,
- "Using QRhi with backend %s\n graphics API debug/validation layers: %d\n QRhi profiling and debug markers: %d",
- qPrintable(backendName), m_debugLayer, m_profile);
+ "Using QRhi with backend %s\n"
+ " Graphics API debug/validation layers: %d\n"
+ " QRhi profiling and debug markers: %d\n"
+ " Shader/pipeline cache collection: %d",
+ qPrintable(backendName), m_debugLayer, m_profile, !m_pipelineCacheSave.isEmpty());
if (m_preferSoftwareRenderer)
qCDebug(QSG_LOG_INFO, "Prioritizing software renderers");
}
@@ -576,6 +584,8 @@ QRhi *QSGRhiSupport::createRhi(QQuickWindow *window, QOffscreenSurface *offscree
flags |= QRhi::EnableProfiling | QRhi::EnableDebugMarkers;
if (isSoftwareRendererRequested())
flags |= QRhi::PreferSoftwareRenderer;
+ if (!m_pipelineCacheSave.isEmpty())
+ flags |= QRhi::EnablePipelineCacheDataSave;
const QRhi::Implementation backend = rhiBackend();
if (backend == QRhi::Null) {
@@ -682,12 +692,48 @@ QRhi *QSGRhiSupport::createRhi(QQuickWindow *window, QOffscreenSurface *offscree
}
#endif
- if (!rhi)
+ if (!rhi) {
qWarning("Failed to create RHI (backend %d)", backend);
+ return nullptr;
+ }
+
+ if (!m_pipelineCacheLoad.isEmpty()) {
+ QFile f(m_pipelineCacheLoad);
+ if (f.open(QIODevice::ReadOnly)) {
+ qCDebug(QSG_LOG_INFO, "Attempting to seed pipeline cache from '%s'",
+ qPrintable(m_pipelineCacheLoad));
+ rhi->setPipelineCacheData(f.readAll());
+ } else {
+ qWarning("Could not open pipeline cache source file '%s'",
+ qPrintable(m_pipelineCacheLoad));
+ }
+ }
return rhi;
}
+void QSGRhiSupport::destroyRhi(QRhi *rhi)
+{
+ if (!rhi)
+ return;
+
+ if (!rhi->isDeviceLost()) {
+ if (!m_pipelineCacheSave.isEmpty()) {
+ QFile f(m_pipelineCacheSave);
+ if (f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+ qCDebug(QSG_LOG_INFO, "Writing pipeline cache contents to '%s'",
+ qPrintable(m_pipelineCacheSave));
+ f.write(rhi->pipelineCacheData());
+ } else {
+ qWarning("Could not open pipeline cache output file '%s'",
+ qPrintable(m_pipelineCacheSave));
+ }
+ }
+ }
+
+ delete rhi;
+}
+
QImage QSGRhiSupport::grabAndBlockInCurrentFrame(QRhi *rhi, QRhiCommandBuffer *cb, QRhiTexture *src)
{
Q_ASSERT(rhi->isRecordingFrame());
diff --git a/src/quick/scenegraph/qsgrhisupport_p.h b/src/quick/scenegraph/qsgrhisupport_p.h
index f144a47a6a..73fa2caad1 100644
--- a/src/quick/scenegraph/qsgrhisupport_p.h
+++ b/src/quick/scenegraph/qsgrhisupport_p.h
@@ -127,6 +127,7 @@ public:
QOffscreenSurface *maybeCreateOffscreenSurface(QWindow *window);
QRhi *createRhi(QQuickWindow *window, QOffscreenSurface *offscreenSurface);
+ void destroyRhi(QRhi *rhi);
void prepareWindowForRhi(QQuickWindow *window);
QImage grabAndBlockInCurrentFrame(QRhi *rhi, QRhiCommandBuffer *cb, QRhiTexture *src = nullptr);
@@ -146,6 +147,8 @@ private:
} m_requested;
QRhi::Implementation m_rhiBackend = QRhi::Null;
int m_killDeviceFrameCount;
+ QString m_pipelineCacheSave;
+ QString m_pipelineCacheLoad;
uint m_settingsApplied : 1;
uint m_enableRhi : 1;
uint m_debugLayer : 1;
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index 9b520d53f2..8a0202ede9 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -556,7 +556,7 @@ void QSGRenderThread::invalidateGraphics(QQuickWindow *window, bool inDestructor
window, dd->swapchain);
}
}
- delete rhi;
+ QSGRhiSupport::instance()->destroyRhi(rhi);
rhi = nullptr;
qCDebug(QSG_LOG_RENDERLOOP, QSG_RT_PAD, "- QRhi destroyed");
} else {
@@ -637,7 +637,7 @@ void QSGRenderThread::handleDeviceLoss()
sgrc->invalidate();
wm->releaseSwapchain(window);
rhiDeviceLost = true;
- delete rhi;
+ QSGRhiSupport::instance()->destroyRhi(rhi);
rhi = nullptr;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 22:35:58 +0000