diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-07-29 17:59:55 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-07-31 12:57:06 +0200 |
commit | c5da2e6f063e262c8e9ea96793728be79fd09737 (patch) | |
tree | 42424c7633e8369607e2ed5e241066841362b501 /tests/auto/gui/rhi/qshader/tst_qshader.cpp | |
parent | 5747f3139219abd6c8670953620cee1f5584caba (diff) |
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 <sona.kurazyan@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/auto/gui/rhi/qshader/tst_qshader.cpp')
-rw-r--r-- | tests/auto/gui/rhi/qshader/tst_qshader.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
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<QShaderKey> 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()); |