From c5da2e6f063e262c8e9ea96793728be79fd09737 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Wed, 29 Jul 2020 17:59:55 +0200
Subject: [PATCH] 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>
---
 tests/auto/gui/rhi/qshader/data/README        |  15 ------------
 .../rhi/qshader/data/color_all_v1.vert.qsb    | Bin 1847 -> 0 bytes
 .../rhi/qshader/data/color_all_v5.vert.qsb    | Bin 0 -> 1491 bytes
 .../rhi/qshader/data/color_spirv_v1.vert.qsb  | Bin 813 -> 0 bytes
 .../rhi/qshader/data/color_spirv_v5.vert.qsb  | Bin 0 -> 544 bytes
 .../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

diff --git a/tests/auto/gui/rhi/qshader/data/README b/tests/auto/gui/rhi/qshader/data/README
deleted file mode 100644
index 3d89f2a0c52..00000000000
--- 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 7d02d823d2fce92a77b685fbff28dd94a86ef5f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1847
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

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 0000000000000000000000000000000000000000..4b8d71bcc3fd7da00088e9253cfaee4626121eb9
GIT binary patch
literal 1491
zcmV;^1uXgi03Ek@ob6fbP8(McKE7aJ6QJP|+LDq(NE4ext_g0b;(~~hh@^@{6e?87
zLMvmh>9+Q+vlj!6_}K^OJM<y?KvjSB0s5zxnR8}$&#rAMD%t|gqGiv_d~-Q-t^<s*
zAts*;yc(-Bo3-F|h?Dw*9u|MzVI4rZ%w!(CHnV`2MZp04B-7bz!0N(wgBij@3f|!X
z8YmlQUC>CzG{^^P<k%kbSrb|#@D18e6jWNE+F-c@tt-Uci1m%0ad6sUH3$H^c|<NY
zg07zCxhj=YpDVoI7rTbznzqGPR!W-YdX8WB_@3X?-e?@2cFimEcDGXzRI_E*JZ^Vt
zb<;blXvY;z^DVP!J8e|qKKuff?R&gy)K_>{uiGu#sc5a*5is*DyI%9q*BW0gaMO~g
zftXT&Df5o)n#cv~UE6FxSf-UPP>kdTG{_V(_gnf)QUU=+R)lWwCB@XSrePY<7LCb+
zC^4CtI_NYFNA&C=cZ_}0^$aJ!R|@<(_JQ86eGQ&PUdo4M;YUY54>=_18@t(b4KH6W
z71aC*5G64IEEi-}VIUw2buz4WrV<k=IgYdYFk@Myf!==k{MC;B*s)z#e{OYrkGhsn
zfGEFs`sL%TtyfP<N>9j*B3+i@_p!d^dkOPl>;tUFx(%4^9VH3J!AyYZ>*=SR4sE}c
z5BhdL9JGR%61_po+18UP4$0j&bQ9Zw@4&MnDk@QQq7YO>G%h0ks7I2~CnBkB3qpca
zPBGrw*zD=SM(GNtl9=3v=Q~!y(XqN<@M$Ou=9f%*aTs@)5%}T6y$0(lCHA<S_-?+~
zeo=J2MzQ>HNp5dqHx;r8HY(b<u?0RxX@A81a1On|53bZ7Q+R4*V_2jSPyG-y>Piab
zIq=6A=EHDyAkD@h>g9;fNJhB=d?wt7u{{l6m@0tIiZ(tlZGavUH1>g(weWo%Xq;P8
ze@Mh13^npLDc*UqwMp^LldWf<6U22T#AF07E#y%gLxd0LMf$3|Vanq(C0@jBklksr
zyGgO%QsP2-L80fAxTioXE#w(7n%KS$tsHzgyt9BG7I~IuCkJ|j+Q_dEJ*vnxiZ76B
zl!Fx68zXyJ5r@pl80k)sopI8gpnfB72Iy-P7uvc<^d$A=U7)APmb5K%JVpM{{tWeT
zn(WVr{z@LoXQ@3!^!wy%jPOX$5fA0_6dTGvfw4)m=x|5=ufW0aU86i+rCh9obd=~v
zfS48W%UC7}k1@PQ{58tk4f6jz=pg+8VQ!EejOQlhY?A!kB;0Qh^`|28a39E02=t_f
z7fq|)@*4*KtZjI;mJZ9kW$vwO5#Kf2jgRnG@vC*XLb#^2&#hY9aAEZrTxeDLTt>oU
z_M{65X<=|B+_?H5In}D~!eI`#4Xaex-5q%BRI9;?MNp4@(;9GKR;xA7bId*8Gx7-s
z!KtZ2mJ5OTuGp5M@MS9>xWgM!wHh2AySw+nm<6OI@^nX>WdM*@7vZ@O-sA#{_^$Cc
z$1)~6b_ST1dS2N*XNhu=0%-i;q9enWCk3w9A>ov!`e8Ij*w5j$bNRtpT|2uq=LjcK
z{OTFzICj~LasQR;C1#*O-$VvV|C<bir3bcmE?Vi)3tJU18Jhmu(`~0=IA@x|1g!Wi
z07FlJRAmPzl{Ap?%nz5jq*3{?!T9G&ov8oOkVJsh3tkJIe(L?_rBf7M9HmT$i&|m9
z`py2NR#^8)aJmXh6YY~KtOa(tsx0JTpTar7E>Go!^a9c7<838&c9j^?L2Nm~a~g{j
z#lJ}LGm0PS+e+>}q;^h`7bvFlUg@C?jQbY#`4LdqpF0Zvwt~A$vhTzWz*wGi?<%@W
zif)1YEfMxFDoYTg_up2Qf3vdecT-VOtCykvOrXVu1wiVZB?&n=Rpp9ROX<8;u94u}
t)+1^SoXF+*s(~*+F0-uXUsmDY78w0wGEx8a$P<6LJ5k=F|0n!GuF#o@@CE<?

literal 0
HcmV?d00001

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 c82ba7e8e76c25ab6099e78a86f1edb523679378..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 813
zcmV+|1Je8e00%I5oSjokPZLoTKGW%RTA)1I;UVRvxG_dT0ve-W)R@467!r&t66|A&
zqiv_oObHmb?A&Nv80rsU>Cf;dxNzapjfvm6_YA#0R+b#@oX7pncfNZs5m}^u_ROo=
zi<q5po5;nQ#p=Ow6m+`1B>v1X*g0&Mbj>5!9ax@PVZE9JVTY*Va9yX`_K6&-hpjN8
zzRR)Xr0er~<k#1TMzC)VwhG%9JjQ)*|BjdbD!Bn}p1NTiNWa1#*y|emDr^IGilI)2
zG0Qyn2zv<+gLn&;fj$3^{w^II=*j-kf9>!7-VLH6^*TW_jM@)@{W7LcmhS%%>syQS
zM2V&QyHpE0ji7TlXit6gFHns)KV}j()p||DKNPsW?YC=w#B+U@bNUK<0~?kZXEV&J
zT}`6kcn|*?;M+IO%BJ>F7j>mPpLy79#(t9ap3QSz9K1$dWyG8pc%t_b44<?Odjfk#
z%vWn#u}$s5ZnYjHCxV;yIwPZpp{Ya7R#;6gG+i}xbtb^~8gn<u;&*27?L+$^ij$~U
zPguAt^^|bt8EpV-7q)L{T+V&rIrQt0H$sg;2m70yS#~+);<hYFbOI-8Da~_g-P+mP
zS&5Uz%KA;FO`~9%0*)zl^jWp5fx2l0Ij?cnjJx2E@5njNib}JVeXdV$BKy2Iy_XI+
zjAA`(9qjtiQ$I@lW8RmOI7u#jNDg|9OPs$wtSnRxxSquMhUAd-WQO!4x%U)&tt{_%
z6#v01g%-khL9n)j?}A`$V^7L!_@c&Ev5d+OcsNp@`pdGKF;{flHu!SgeZlnvcT2cm
zF?g|m+3+g{?=p5}RNhvn$=_4>!t+%3U>fzV(wS6#34UI_Ieu6Cf{`B*erbM4G_VA(
zD0o@LLu*o$y<>tiDtpIdZjMdDpAcS*bzS_D%rXPNELa*_Yh0Foj6W$edV)Wx=G8II
zPs?{%{8{N$lzR3n665@WaO3<foJ~f0lf-`@!sojwI*y1I_mC}!{{R)!iofPkl6vNF
rN#dKL+nn@&hdu1iOU<0%FrP)ytR#IFrS2zK-`3AR%kS<NZr!o@z=ERl

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 0000000000000000000000000000000000000000..3a3f2fcc0e421d20ff5d66c819a5c6a266c343cb
GIT binary patch
literal 544
zcmV+*0^j`r00l&NoRw4CYEw}VopZ_EBsP~uO--YHEEFG91gS(2(uY0>g0CS>QwbzJ
zhvX#K&*<OyQGS3gqHAWalbj$5?y%XjX4cHCJv&E4a^jYcU6zSNGRIy51=!v%F4<oX
zB?fCHGfA)`xrHy(z+d<tc1<=i`lG|YGV*dIYq^0{#F^S3GA!R%3sjC_Rp=e;Ddno6
zX)I$1P|<g6F-V2~&+>R)?_9z6z&|NysEA*m-UA5qOjzE|;pL~xvsH3^_VU#WrzzML
ztV_vkRkIk+bfV^|@Dg3^f}dXbo2L&K?r{|>e>0jy^Jr;Ua~;xn9{ohV%ts%m%g@tg
zGW{wxKIa$4qSY*!MYrGw+u^C*!g;m60XsBX*J2X`=M3u|qIf)+C3n{Q5O}Q#mY*~I
zaavqwLA^cJ8d7hMwJwm8>Z)uxf%$xk?{wtIPw@%Qtgpa1US#wtZ@{`O)*Vv&^NcRV
z&oa21(cMIrZ}GrhQ|&`od7ORh4)_I|v-`vMfs3@&|CYFviI=G_jh8tCkM*jo7n%+?
zlPYuTtW#rdo%dE>8~A{_wALwcgLioZ++;0R+s(Miep<iHJGNNAZTEFPjdy4_iJ!1n
zm3+lr`ZV67HjTf=+xW8kBGvx`9(~_)&hY_f@ea`v@p~{jrr&94kgpmZ(|^vn9kKsC
iauh!$=ZJMw&oO7#V4q|1enRyd_xXqEclR4NVqsWNV-*Sj

literal 0
HcmV?d00001

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 79f54869458093e5b26fa0e5553ad27bf9cc5f0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1691
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

diff --git a/tests/auto/gui/rhi/qshader/tst_qshader.cpp b/tests/auto/gui/rhi/qshader/tst_qshader.cpp
index 602a355cd9c..7cd87c80b62 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());