diff options
author | Janne Kangas <janne.kangas@qt.io> | 2019-07-26 14:49:10 +0300 |
---|---|---|
committer | Janne Kangas <janne.kangas@qt.io> | 2019-10-02 14:09:06 +0300 |
commit | 3af0e80dbd23ff6ad4d18093ab7aa065b16727ac (patch) | |
tree | 53e818f6eb56793cac6e35db29ea1535059fd3a7 /src/runtimerender/Qt3DSRenderShaderCache.cpp | |
parent | 3c53d50068768bc574b80ecb865eeb9aeb1c2356 (diff) |
Indicate material shader errors in Editor
Task-id: QT3DS-3964
Change-Id: Ifac1df41862821c7220c3e9c88d34ceceaacbb0f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/runtimerender/Qt3DSRenderShaderCache.cpp')
-rw-r--r-- | src/runtimerender/Qt3DSRenderShaderCache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtimerender/Qt3DSRenderShaderCache.cpp b/src/runtimerender/Qt3DSRenderShaderCache.cpp index fd2c669..21d2247 100644 --- a/src/runtimerender/Qt3DSRenderShaderCache.cpp +++ b/src/runtimerender/Qt3DSRenderShaderCache.cpp @@ -457,16 +457,16 @@ struct ShaderCache : public IShaderCache CompileProgram(CRegisteredString inKey, const char8_t *inVert, const char8_t *inFrag, const char8_t *inTessCtrl, const char8_t *inTessEval, const char8_t *inGeom, const SShaderCacheProgramFlags &inFlags, - NVConstDataRef<SShaderPreprocessorFeature> inFeatures, bool separableProgram) override + NVConstDataRef<SShaderPreprocessorFeature> inFeatures, + QString &errors, bool separableProgram) override { NVRenderShaderProgram *theProgram = GetProgram(inKey, inFeatures); if (theProgram) return theProgram; - QString error; NVRenderShaderProgram *retval = ForceCompileProgram(inKey, inVert, inFrag, inTessCtrl, inTessEval, inGeom, inFlags, - inFeatures, error, separableProgram); + inFeatures, errors, separableProgram); return retval; } |