1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove old qsb versions from qshader autotest

Browse Source 
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>
This commit is contained in:
Laszlo Agocs 2020-07-29 17:59:55 +02:00
parent 5747f31392
commit c5da2e6f06
7 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/gui/rhi/qshader/data/README
View File

@ -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.

BIN
tests/auto/gui/rhi/qshader/data/color_all_v1.vert.qsb
View File

Binary file not shown.

BIN
tests/auto/gui/rhi/qshader/data/color_all_v5.vert.qsb Normal file
View File

Binary file not shown.

BIN
tests/auto/gui/rhi/qshader/data/color_spirv_v1.vert.qsb
View File

Binary file not shown.

BIN
tests/auto/gui/rhi/qshader/data/color_spirv_v5.vert.qsb Normal file
View File

Binary file not shown.

BIN
tests/auto/gui/rhi/qshader/data/texture_all_v2.frag.qsb
View File

Binary file not shown.

22
tests/auto/gui/rhi/qshader/tst_qshader.cpp
View File

@ -75,9 +75,9 @@ void tst_QShader::serializeDeserialize()
void tst_QShader::simpleCompileCheckResults() 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()); QVERIFY(s.isValid());
QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 1); QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 5);
QCOMPARE(s.availableShaders().count(), 1); QCOMPARE(s.availableShaders().count(), 1);
const QShaderCode shader = s.shader(QShaderKey(QShader::SpirvShader, const QShaderCode shader = s.shader(QShaderKey(QShader::SpirvShader,
@ -148,11 +148,11 @@ void tst_QShader::simpleCompileCheckResults()
void tst_QShader::genVariants() 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 // spirv, glsl 100, glsl 330, glsl 120, hlsl 50, msl 12
// + batchable variants // + batchable variants
QVERIFY(s.isValid()); QVERIFY(s.isValid());
QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 1); QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 5);
QCOMPARE(s.availableShaders().count(), 2 * 6); QCOMPARE(s.availableShaders().count(), 2 * 6);
int batchableVariantCount = 0; int batchableVariantCount = 0;
@ -173,9 +173,9 @@ void tst_QShader::genVariants()
void tst_QShader::shaderDescImplicitSharing() 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()); QVERIFY(s.isValid());
QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 1); QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 5);
QCOMPARE(s.availableShaders().count(), 1); QCOMPARE(s.availableShaders().count(), 1);
QVERIFY(s.availableShaders().contains(QShaderKey(QShader::SpirvShader, QShaderVersion(100)))); QVERIFY(s.availableShaders().contains(QShaderKey(QShader::SpirvShader, QShaderVersion(100))));
@ -211,9 +211,9 @@ void tst_QShader::shaderDescImplicitSharing()
void tst_QShader::bakedShaderImplicitSharing() 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()); QVERIFY(s0.isValid());
QCOMPARE(QShaderPrivate::get(&s0)->qsbVersion, 1); QCOMPARE(QShaderPrivate::get(&s0)->qsbVersion, 5);
QCOMPARE(s0.availableShaders().count(), 1); QCOMPARE(s0.availableShaders().count(), 1);
QVERIFY(s0.availableShaders().contains(QShaderKey(QShader::SpirvShader, QShaderVersion(100)))); QVERIFY(s0.availableShaders().contains(QShaderKey(QShader::SpirvShader, QShaderVersion(100))));
@ -262,9 +262,9 @@ void tst_QShader::bakedShaderImplicitSharing()
void tst_QShader::mslResourceMapping() 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()); QVERIFY(s.isValid());
QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 2); QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 4);
const QList<QShaderKey> availableShaders = s.availableShaders(); const QList<QShaderKey> availableShaders = s.availableShaders();
QCOMPARE(availableShaders.count(), 7); QCOMPARE(availableShaders.count(), 7);
@ -430,7 +430,7 @@ void tst_QShader::comparison()
{ {
QShader s1 = getShader(QLatin1String(":/data/texture_all_v4.frag.qsb")); QShader s1 = getShader(QLatin1String(":/data/texture_all_v4.frag.qsb"));
QVERIFY(s1.isValid()); 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(s2.isValid());
QVERIFY(s1.description().isValid()); QVERIFY(s1.description().isValid());