diff options
Diffstat (limited to 'src/runtimerender/Qt3DSRenderShaderCache.cpp')
| -rw-r--r-- | src/runtimerender/Qt3DSRenderShaderCache.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/runtimerender/Qt3DSRenderShaderCache.cpp b/src/runtimerender/Qt3DSRenderShaderCache.cpp index e26405c..3794a83 100644 --- a/src/runtimerender/Qt3DSRenderShaderCache.cpp +++ b/src/runtimerender/Qt3DSRenderShaderCache.cpp @@ -571,10 +571,11 @@ struct ShaderCache : public IShaderCache return retval; } - void importShaderCache(const QByteArray &shaderCache) override + void importShaderCache(const QByteArray &shaderCache, QString &errors) override { #define BAILOUT(details) { \ - qWarning() << "importShaderCache failed to import shader cache:" << details; \ + errors = "importShaderCache failed to import shader cache: " details; \ + qWarning() << errors; \ return; \ } @@ -634,9 +635,13 @@ struct ShaderCache : public IShaderCache qCInfo(TRACE_INFO) << "Loading binary program from shader cache: '<" << key << ">'"; eastl::pair<TShaderMap::iterator, bool> theInserter = m_Shaders.insert(tempKey); - theInserter.first->second - = m_RenderContext.CompileBinary(theKey, format, binary).mShader; - theShader = theInserter.first->second; + auto ret = m_RenderContext.CompileBinary(theKey, format, binary); + if (!ret.errors.isEmpty()) { + errors += ret.errors + "\n"; + } else { + theInserter.first->second = ret.mShader; + theShader = ret.mShader; + } } else { QByteArray loadVertexData; QByteArray loadFragmentData; @@ -663,6 +668,10 @@ struct ShaderCache : public IShaderCache qt3ds::foundation::toDataRef( features.data(), static_cast<QT3DSU32>(features.size())), error, false, true); + if (!error.isEmpty()) { + errors += error + "\n"; + theShader = nullptr; + } } } // If something doesn't save or load correctly, get the runtime to re-generate. |