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/api/studio3dqml/q3dsplugin.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/api/studio3dqml/q3dsplugin.cpp')
-rw-r--r-- | src/api/studio3dqml/q3dsplugin.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/api/studio3dqml/q3dsplugin.cpp b/src/api/studio3dqml/q3dsplugin.cpp index f481ed3..ee9a9b9 100644 --- a/src/api/studio3dqml/q3dsplugin.cpp +++ b/src/api/studio3dqml/q3dsplugin.cpp @@ -63,6 +63,11 @@ void Q3DSPlugin::registerTypes(const char *uri) qmlRegisterType<Q3DSStudio3D, 1>(uri, 2, 5, "Studio3D"); qmlRegisterType<Q3DSViewerSettings, 1>(uri, 2, 5, "ViewerSettings"); qmlRegisterType<Q3DSPresentationItem, 1>(uri, 2, 5, "Presentation"); + qmlRegisterRevision<Q3DSPresentation, 1>(uri, 2, 5); + + // 2.7 + qmlRegisterType<Q3DSPresentationItem, 2>(uri, 2, 7, "Presentation"); + qmlRegisterRevision<Q3DSPresentation, 2>(uri, 2, 7); // Automatically register the latest version qmlRegisterModule(uri, ((QTSTUDIO3D_VERSION >> 16) & 0xff), ((QTSTUDIO3D_VERSION >> 8) & 0xff)); |