diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-08-10 16:12:02 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-08-11 13:45:09 +0200 |
commit | a99cee1c7b095a552c04c2aa832574a6f0f44720 (patch) | |
tree | 2bcad127a2ec4a64ee4c7c97b495ea6088cedbb0 /tests/auto/gui/rhi | |
parent | fed97b92643e227159a796f5ad62d28c6ed4db5e (diff) |
Remove old CBOR-based format from QShader
We only support version 4 and 5 in Qt 6.0. 1 and 2 are already gone
(due to being based on binary JSON), now we remove 3 as well.
Task-number: QTBUG-81346
Change-Id: I3627dcc0587f1e36f11e93edf7172889e911d64e
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tests/auto/gui/rhi')
-rw-r--r-- | tests/auto/gui/rhi/qshader/data/texture_all_v3.frag.qsb | bin | 1432 -> 0 bytes | |||
-rw-r--r-- | tests/auto/gui/rhi/qshader/tst_qshader.cpp | 75 |
2 files changed, 0 insertions, 75 deletions
diff --git a/tests/auto/gui/rhi/qshader/data/texture_all_v3.frag.qsb b/tests/auto/gui/rhi/qshader/data/texture_all_v3.frag.qsb Binary files differdeleted file mode 100644 index b6e49aa03d..0000000000 --- a/tests/auto/gui/rhi/qshader/data/texture_all_v3.frag.qsb +++ /dev/null diff --git a/tests/auto/gui/rhi/qshader/tst_qshader.cpp b/tests/auto/gui/rhi/qshader/tst_qshader.cpp index 7cd87c80b6..fc01b8d6a5 100644 --- a/tests/auto/gui/rhi/qshader/tst_qshader.cpp +++ b/tests/auto/gui/rhi/qshader/tst_qshader.cpp @@ -42,7 +42,6 @@ private slots: void shaderDescImplicitSharing(); void bakedShaderImplicitSharing(); void mslResourceMapping(); - void loadV3(); void serializeShaderDesc(); void comparison(); void loadV4(); @@ -291,80 +290,6 @@ void tst_QShader::mslResourceMapping() QCOMPARE(resMap->value(1), qMakePair(0, 0)); // mapped to native texture index 0 and sampler index 0 } -void tst_QShader::loadV3() -{ - // qsb version 3: QShaderDescription is serialized as CBOR. Ensure the deserialized data is as expected. - QShader s = getShader(QLatin1String(":/data/texture_all_v3.frag.qsb")); - QVERIFY(s.isValid()); - QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 3); - - const QList<QShaderKey> availableShaders = s.availableShaders(); - QCOMPARE(availableShaders.count(), 7); - 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(100, QShaderVersion::GlslEs)))); - QVERIFY(availableShaders.contains(QShaderKey(QShader::GlslShader, QShaderVersion(120)))); - QVERIFY(availableShaders.contains(QShaderKey(QShader::GlslShader, QShaderVersion(150)))); - QVERIFY(availableShaders.contains(QShaderKey(QShader::GlslShader, QShaderVersion(330)))); - - const QShaderDescription desc = s.description(); - QVERIFY(desc.isValid()); - QCOMPARE(desc.inputVariables().count(), 1); - for (const QShaderDescription::InOutVariable &v : desc.inputVariables()) { - switch (v.location) { - case 0: - QCOMPARE(v.name, QByteArrayLiteral("qt_TexCoord")); - QCOMPARE(v.type, QShaderDescription::Vec2); - break; - default: - QVERIFY(false); - break; - } - } - QCOMPARE(desc.outputVariables().count(), 1); - for (const QShaderDescription::InOutVariable &v : desc.outputVariables()) { - switch (v.location) { - case 0: - QCOMPARE(v.name, QByteArrayLiteral("fragColor")); - QCOMPARE(v.type, QShaderDescription::Vec4); - break; - default: - QVERIFY(false); - break; - } - } - QCOMPARE(desc.uniformBlocks().count(), 1); - const QShaderDescription::UniformBlock blk = desc.uniformBlocks().first(); - QCOMPARE(blk.blockName, QByteArrayLiteral("buf")); - QCOMPARE(blk.structName, QByteArrayLiteral("ubuf")); - QCOMPARE(blk.size, 68); - QCOMPARE(blk.binding, 0); - QCOMPARE(blk.descriptorSet, 0); - QCOMPARE(blk.members.count(), 2); - for (int i = 0; i < blk.members.count(); ++i) { - const QShaderDescription::BlockVariable v = blk.members[i]; - switch (i) { - case 0: - QCOMPARE(v.offset, 0); - QCOMPARE(v.size, 64); - QCOMPARE(v.name, QByteArrayLiteral("qt_Matrix")); - QCOMPARE(v.type, QShaderDescription::Mat4); - QCOMPARE(v.matrixStride, 16); - break; - case 1: - QCOMPARE(v.offset, 64); - QCOMPARE(v.size, 4); - QCOMPARE(v.name, QByteArrayLiteral("opacity")); - QCOMPARE(v.type, QShaderDescription::Float); - break; - default: - QVERIFY(false); - break; - } - } -} - void tst_QShader::serializeShaderDesc() { // default constructed QShaderDescription |