From c5da2e6f063e262c8e9ea96793728be79fd09737 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 29 Jul 2020 17:59:55 +0200 Subject: Remove old qsb versions from qshader autotest Only keep 3, 4, and 5 because 3 is the lowest version where binary JSON is not used anymore. Change-Id: Id0319e8eceb845017ed493d0ef6902b53050d5a6 Reviewed-by: Sona Kurazyan Reviewed-by: Edward Welbourne Reviewed-by: Laszlo Agocs --- tests/auto/gui/rhi/qshader/data/README | 15 -------------- .../gui/rhi/qshader/data/color_all_v1.vert.qsb | Bin 1847 -> 0 bytes .../gui/rhi/qshader/data/color_all_v5.vert.qsb | Bin 0 -> 1491 bytes .../gui/rhi/qshader/data/color_spirv_v1.vert.qsb | Bin 813 -> 0 bytes .../gui/rhi/qshader/data/color_spirv_v5.vert.qsb | Bin 0 -> 544 bytes .../gui/rhi/qshader/data/texture_all_v2.frag.qsb | Bin 1691 -> 0 bytes tests/auto/gui/rhi/qshader/tst_qshader.cpp | 22 ++++++++++----------- 7 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 tests/auto/gui/rhi/qshader/data/README delete mode 100644 tests/auto/gui/rhi/qshader/data/color_all_v1.vert.qsb create mode 100644 tests/auto/gui/rhi/qshader/data/color_all_v5.vert.qsb delete mode 100644 tests/auto/gui/rhi/qshader/data/color_spirv_v1.vert.qsb create mode 100644 tests/auto/gui/rhi/qshader/data/color_spirv_v5.vert.qsb delete mode 100644 tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb (limited to 'tests/auto/gui/rhi/qshader') diff --git a/tests/auto/gui/rhi/qshader/data/README b/tests/auto/gui/rhi/qshader/data/README deleted file mode 100644 index 3d89f2a0c5..0000000000 --- a/tests/auto/gui/rhi/qshader/data/README +++ /dev/null @@ -1,15 +0,0 @@ -Warning: Do NOT regenerate the .qsb files without proper planning and understanding -the following. - -Among other things, we are also testing backwards compatibility for QShader -deserialization. - -.qsb files with _v1 in the name were produced with an older qtshadertools -and have a QSB_VERSION of 1. - -Files with _v2 are generated with a newer qsb, those have QSB_VERSION 2. -The difference is the support for nativeResourceBindingMap() which is only -present in v2. - -Files with _v3 come from an even newer qsb, and have QSB_VERSION 3. The -difference to 2 is the use of CBOR instead of binary JSON for QShaderDescription. diff --git a/tests/auto/gui/rhi/qshader/data/color_all_v1.vert.qsb b/tests/auto/gui/rhi/qshader/data/color_all_v1.vert.qsb deleted file mode 100644 index 7d02d823d2..0000000000 Binary files a/tests/auto/gui/rhi/qshader/data/color_all_v1.vert.qsb and /dev/null differ diff --git a/tests/auto/gui/rhi/qshader/data/color_all_v5.vert.qsb b/tests/auto/gui/rhi/qshader/data/color_all_v5.vert.qsb new file mode 100644 index 0000000000..4b8d71bcc3 Binary files /dev/null and b/tests/auto/gui/rhi/qshader/data/color_all_v5.vert.qsb differ diff --git a/tests/auto/gui/rhi/qshader/data/color_spirv_v1.vert.qsb b/tests/auto/gui/rhi/qshader/data/color_spirv_v1.vert.qsb deleted file mode 100644 index c82ba7e8e7..0000000000 Binary files a/tests/auto/gui/rhi/qshader/data/color_spirv_v1.vert.qsb and /dev/null differ diff --git a/tests/auto/gui/rhi/qshader/data/color_spirv_v5.vert.qsb b/tests/auto/gui/rhi/qshader/data/color_spirv_v5.vert.qsb new file mode 100644 index 0000000000..3a3f2fcc0e Binary files /dev/null and b/tests/auto/gui/rhi/qshader/data/color_spirv_v5.vert.qsb differ diff --git a/tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb b/tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb deleted file mode 100644 index 79f5486945..0000000000 Binary files a/tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb and /dev/null differ diff --git a/tests/auto/gui/rhi/qshader/tst_qshader.cpp b/tests/auto/gui/rhi/qshader/tst_qshader.cpp index 602a355cd9..7cd87c80b6 100644 --- a/tests/auto/gui/rhi/qshader/tst_qshader.cpp +++ b/tests/auto/gui/rhi/qshader/tst_qshader.cpp @@ -75,9 +75,9 @@ void tst_QShader::serializeDeserialize() void tst_QShader::simpleCompileCheckResults() { - QShader s = getShader(QLatin1String(":/data/color_spirv_v1.vert.qsb")); + QShader s = getShader(QLatin1String(":/data/color_spirv_v5.vert.qsb")); QVERIFY(s.isValid()); - QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 1); + QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 5); QCOMPARE(s.availableShaders().count(), 1); const QShaderCode shader = s.shader(QShaderKey(QShader::SpirvShader, @@ -148,11 +148,11 @@ void tst_QShader::simpleCompileCheckResults() void tst_QShader::genVariants() { - QShader s = getShader(QLatin1String(":/data/color_all_v1.vert.qsb")); + QShader s = getShader(QLatin1String(":/data/color_all_v5.vert.qsb")); // spirv, glsl 100, glsl 330, glsl 120, hlsl 50, msl 12 // + batchable variants QVERIFY(s.isValid()); - QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 1); + QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 5); QCOMPARE(s.availableShaders().count(), 2 * 6); int batchableVariantCount = 0; @@ -173,9 +173,9 @@ void tst_QShader::genVariants() void tst_QShader::shaderDescImplicitSharing() { - QShader s = getShader(QLatin1String(":/data/color_spirv_v1.vert.qsb")); + QShader s = getShader(QLatin1String(":/data/color_spirv_v5.vert.qsb")); QVERIFY(s.isValid()); - QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 1); + QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 5); QCOMPARE(s.availableShaders().count(), 1); QVERIFY(s.availableShaders().contains(QShaderKey(QShader::SpirvShader, QShaderVersion(100)))); @@ -211,9 +211,9 @@ void tst_QShader::shaderDescImplicitSharing() void tst_QShader::bakedShaderImplicitSharing() { - QShader s0 = getShader(QLatin1String(":/data/color_spirv_v1.vert.qsb")); + QShader s0 = getShader(QLatin1String(":/data/color_spirv_v5.vert.qsb")); QVERIFY(s0.isValid()); - QCOMPARE(QShaderPrivate::get(&s0)->qsbVersion, 1); + QCOMPARE(QShaderPrivate::get(&s0)->qsbVersion, 5); QCOMPARE(s0.availableShaders().count(), 1); QVERIFY(s0.availableShaders().contains(QShaderKey(QShader::SpirvShader, QShaderVersion(100)))); @@ -262,9 +262,9 @@ void tst_QShader::bakedShaderImplicitSharing() void tst_QShader::mslResourceMapping() { - QShader s = getShader(QLatin1String(":/data/texture_all_v2.frag.qsb")); + QShader s = getShader(QLatin1String(":/data/texture_all_v4.frag.qsb")); QVERIFY(s.isValid()); - QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 2); + QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 4); const QList availableShaders = s.availableShaders(); QCOMPARE(availableShaders.count(), 7); @@ -430,7 +430,7 @@ void tst_QShader::comparison() { QShader s1 = getShader(QLatin1String(":/data/texture_all_v4.frag.qsb")); QVERIFY(s1.isValid()); - QShader s2 = getShader(QLatin1String(":/data/color_all_v1.vert.qsb")); + QShader s2 = getShader(QLatin1String(":/data/color_all_v5.vert.qsb")); QVERIFY(s2.isValid()); QVERIFY(s1.description().isValid()); -- cgit v1.2.3