diff options
author | Antti Määttä <antti.maatta@qt.io> | 2020-02-07 14:12:42 +0200 |
---|---|---|
committer | Antti Määttä <antti.maatta@qt.io> | 2020-02-10 14:02:35 +0200 |
commit | bff0bf78b328b730843abf0e79f58e8411908de5 (patch) | |
tree | 6fcf341f3d79dfc6d9af50d52b99f4c603fba287 /src/engine/Qt3DSRuntimeView.cpp | |
parent | 90dd0bdcf1c9e3a1eddee8abcf4307c06e82e37b (diff) |
Implement shader cache loading error handling
Task-number: QT3DS-4040
Change-Id: Ie5f8284ab76cd4aa5f3ff0701457f4ef84c3e215
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/engine/Qt3DSRuntimeView.cpp')
-rw-r--r-- | src/engine/Qt3DSRuntimeView.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/engine/Qt3DSRuntimeView.cpp b/src/engine/Qt3DSRuntimeView.cpp index c1b5669..7cebdd6 100644 --- a/src/engine/Qt3DSRuntimeView.cpp +++ b/src/engine/Qt3DSRuntimeView.cpp @@ -172,7 +172,8 @@ public: bool BeginLoad(const QString &sourcePath, const QStringList &variantList) override; bool HasOfflineLoadingCompleted() override; bool InitializeGraphics(const QSurfaceFormat &format, bool delayedLoading, - bool initInRenderThread, const QByteArray &shaderCache) override; + bool initInRenderThread, const QByteArray &shaderCache, + QString &errors) override; void connectSignals() override; void finishAsyncInit() override; @@ -302,7 +303,8 @@ bool CRuntimeView::HasOfflineLoadingCompleted() } bool CRuntimeView::InitializeGraphics(const QSurfaceFormat &format, bool delayedLoading, - bool initInRenderThread, const QByteArray &shaderCache) + bool initInRenderThread, const QByteArray &shaderCache, + QString &errors) { m_ApplicationCore->EndLoad(); // Next call will initialize the render portion of the scenes. This *must* have a loaded @@ -311,7 +313,8 @@ bool CRuntimeView::InitializeGraphics(const QSurfaceFormat &format, bool delayed m_Application = m_ApplicationCore->CreateApplication(*m_InputEngine, m_AudioPlayer, *m_RuntimeFactory, shaderCache, - initInRenderThread); + initInRenderThread, + errors); if (!m_Application->createSuccessful()) return false; |