1 files changed, 33 insertions, 10 deletions

diff --git a/tests/auto/gui/rhi/qshader/tst_qshader.cpp b/tests/auto/gui/rhi/qshader/tst_qshader.cpp
index 861adff463..9e179c95c3 100644
--- a/tests/auto/gui/rhi/qshader/tst_qshader.cpp
+++ b/tests/auto/gui/rhi/qshader/tst_qshader.cpp
@@ -1,12 +1,12 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QFile>
 #include <QBuffer>
 
-#include <QtGui/private/qshaderdescription_p_p.h>
-#include <QtGui/private/qshader_p_p.h>
+#include <private/qshaderdescription_p.h>
+#include <private/qshader_p.h>
 
 class tst_QShader : public QObject
 {
@@ -26,6 +26,7 @@ private slots:
     void manualShaderPackCreation();
     void loadV6WithSeparateImagesAndSamplers();
     void loadV7();
+    void loadV8();
 };
 
 static QShader getShader(const QString &name)
@@ -276,7 +277,7 @@ void tst_QShader::mslResourceMapping()
     resMap = s.nativeResourceBindingMap(QShaderKey(QShader::MslShader, QShaderVersion(12)));
     QVERIFY(!resMap.isEmpty());
 
-    QCOMPARE(resMap.count(), 2);
+    QCOMPARE(resMap.size(), 2);
     QCOMPARE(resMap.value(0).first, 0); // mapped to native buffer index 0
     QCOMPARE(resMap.value(1), qMakePair(0, 0)); // mapped to native texture index 0 and sampler index 0
 }
@@ -293,7 +294,7 @@ void tst_QShader::serializeShaderDesc()
             QBuffer buf(&data);
             QDataStream ds(&buf);
             QVERIFY(buf.open(QIODevice::WriteOnly));
-            desc.serialize(&ds);
+            desc.serialize(&ds, QShaderPrivate::QSB_VERSION);
         }
         QVERIFY(!data.isEmpty());
 
@@ -318,7 +319,7 @@ void tst_QShader::serializeShaderDesc()
             QBuffer buf(&data);
             QDataStream ds(&buf);
             QVERIFY(buf.open(QIODevice::WriteOnly));
-            desc.serialize(&ds);
+            desc.serialize(&ds, QShaderPrivate::QSB_VERSION);
         }
         QVERIFY(!data.isEmpty());
 
@@ -575,10 +576,10 @@ void tst_QShader::loadV6WithSeparateImagesAndSamplers()
 
     QShader::NativeResourceBindingMap resMap =
             s.nativeResourceBindingMap(QShaderKey(QShader::HlslShader, QShaderVersion(50)));
-    QVERIFY(resMap.count() == 4);
+    QVERIFY(resMap.size() == 4);
     QVERIFY(s.separateToCombinedImageSamplerMappingList(QShaderKey(QShader::HlslShader, QShaderVersion(50))).isEmpty());
     resMap = s.nativeResourceBindingMap(QShaderKey(QShader::MslShader, QShaderVersion(12)));
-    QVERIFY(resMap.count() == 4);
+    QVERIFY(resMap.size() == 4);
     QVERIFY(s.separateToCombinedImageSamplerMappingList(QShaderKey(QShader::MslShader, QShaderVersion(12))).isEmpty());
 
     for (auto key : {
@@ -587,7 +588,7 @@ void tst_QShader::loadV6WithSeparateImagesAndSamplers()
          QShaderKey(QShader::GlslShader, QShaderVersion(150)) })
     {
          auto list = s.separateToCombinedImageSamplerMappingList(key);
-         QCOMPARE(list.count(), 2);
+         QCOMPARE(list.size(), 2);
     }
 }
 
@@ -665,7 +666,7 @@ void tst_QShader::loadV7()
     QCOMPARE(tese.description().inputBuiltinVariables()[2].type, QShaderDescription::TessLevelInnerBuiltin);
     QCOMPARE(tese.description().inputBuiltinVariables()[3].type, QShaderDescription::TessCoordBuiltin);
 
-    QCOMPARE(tese.nativeResourceBindingMap(QShaderKey(QShader::MslShader, QShaderVersion(12))).count(), 1);
+    QCOMPARE(tese.nativeResourceBindingMap(QShaderKey(QShader::MslShader, QShaderVersion(12))).size(), 1);
     QCOMPARE(tese.nativeResourceBindingMap(QShaderKey(QShader::MslShader, QShaderVersion(12))).value(0), qMakePair(0, -1));
 
     QShader frag = getShader(QLatin1String(":/data/metal_enabled_tessellation_v7.frag.qsb"));
@@ -673,5 +674,27 @@ void tst_QShader::loadV7()
     QCOMPARE(QShaderPrivate::get(&frag)->qsbVersion, 7);
 }
 
+void tst_QShader::loadV8()
+{
+    QShader s = getShader(QLatin1String(":/data/storage_buffer_info_v8.comp.qsb"));
+    QVERIFY(s.isValid());
+    QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 8);
+
+    const QList<QShaderKey> availableShaders = s.availableShaders();
+    QCOMPARE(availableShaders.size(), 5);
+    QVERIFY(availableShaders.contains(QShaderKey(QShader::SpirvShader, QShaderVersion(100))));
+    QVERIFY(availableShaders.contains(QShaderKey(QShader::MslShader, QShaderVersion(12))));
+    QVERIFY(availableShaders.contains(QShaderKey(QShader::HlslShader, QShaderVersion(50))));
+    QVERIFY(availableShaders.contains(
+            QShaderKey(QShader::GlslShader, QShaderVersion(310, QShaderVersion::GlslEs))));
+    QVERIFY(availableShaders.contains(QShaderKey(QShader::GlslShader, QShaderVersion(430))));
+
+    QCOMPARE(s.description().storageBlocks().size(), 1);
+    QCOMPARE(s.description().storageBlocks().last().runtimeArrayStride, 4);
+    QCOMPARE(s.description().storageBlocks().last().qualifierFlags,
+             QShaderDescription::QualifierFlags(QShaderDescription::QualifierWriteOnly
+                                                | QShaderDescription::QualifierRestrict));
+}
+
 #include <tst_qshader.moc>
 QTEST_MAIN(tst_QShader)