diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-02-20 17:03:03 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2020-02-25 09:45:24 +0200 |
| commit | 3f1cbceae33d346f939b76a18b91c45abe038051 (patch) | |
| tree | c1567118b8dd779470d9774c270bf364cfdd3f33 /src/render/Qt3DSRenderShaderProgram.cpp | |
| parent | 9db175350be8223f947a2c0436f59586a86e921b (diff) | |
Shader caching improvements
Added shader cache load error generation to some cases where it was
missing.
Properly pass the error to surface viewer.
If there was a cache load error, allow exporting the generated cache.
Added overloads to generate shader cache with specified compression
level.
Change-Id: I06d56114918ada23d46474e9466f6031ad8037e2
Fixes: QT3DS-4071
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/render/Qt3DSRenderShaderProgram.cpp')
| -rw-r--r-- | src/render/Qt3DSRenderShaderProgram.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/render/Qt3DSRenderShaderProgram.cpp b/src/render/Qt3DSRenderShaderProgram.cpp index b5f2a77..2ed881a 100644 --- a/src/render/Qt3DSRenderShaderProgram.cpp +++ b/src/render/Qt3DSRenderShaderProgram.cpp @@ -1222,9 +1222,8 @@ namespace render { bProgramIsValid = pProgram->link(format, &binary); if (!bProgramIsValid && pProgram) { - NVFoundationBase &foundation(context.GetFoundation()); qCCritical(INTERNAL_ERROR, "Failed to link binary program!!"); - WriteErrorMessage(foundation, "Program link output:", pProgram->GetErrorMessage()); + result.errors = QStringLiteral("Binary program link failed"); // delete program QT3DS_FREE(context.GetFoundation().getAllocator(), pProgram); |