From 7c3779006d8d296b18fbf78fa9e767ceac05081f Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Sat, 21 Oct 2023 20:48:22 +0200
Subject: [PATCH] tst_qrhi: Exercise a readonly storage buffer in the simple
 test

...not only in the tessellation-related ones (that are skipped
with D3D).

The checked-in .qsb file is generated with a patched shadertools
that fixes a bug regarding readonly storage buffers and HLSL.

Change-Id: Iafbad4e81875d7b4f877435b9b1e6078019d52ac
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 .../auto/gui/rhi/qrhi/data/storagebuffer.comp |   2 +-
 .../gui/rhi/qrhi/data/storagebuffer.comp.qsb  | Bin 1239 -> 1262 bytes
 tests/auto/gui/rhi/qrhi/tst_qrhi.cpp          |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/gui/rhi/qrhi/data/storagebuffer.comp b/tests/auto/gui/rhi/qrhi/data/storagebuffer.comp
index fd6cabebc5f..ffa0bc70041 100644
--- a/tests/auto/gui/rhi/qrhi/data/storagebuffer.comp
+++ b/tests/auto/gui/rhi/qrhi/data/storagebuffer.comp
@@ -2,7 +2,7 @@
 layout (local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 
 
-layout (binding = 0, std430) buffer toGpu
+layout (binding = 0, std430) readonly buffer toGpu
 {
     float _float;
     vec2 _vec2;
diff --git a/tests/auto/gui/rhi/qrhi/data/storagebuffer.comp.qsb b/tests/auto/gui/rhi/qrhi/data/storagebuffer.comp.qsb
index 77887ed941fc54790b6eabe587a10c1ddddc965a..b02f541cc5d93f118ef5b689a0e3139b56d50b89 100644
GIT binary patch
literal 1262
zcmV<K1QGiH01w%Cob6UyZ{tK1o?LqKmbU4(u)77;ZJ{_zNt4)AD?%&nzJ!N9(T9Dg
zqR5S%uC<9>`BKqE`<Hm)2O;q%ctLQ^%;(r~(jf7O7<HUE-+bpjGpZ0`O$f0hW=EOk
zh8T)a1Y#_@;#MTsY0@lVU8T7y`oa^wh^0n`&y00Ryc4b%h&IWaQd!M~WRv7A%=LdF
zTO`+L>QH!aXcTcUlUX{dFgp|@V%ajgeAaW!^>ewE7v+{wIkU>5%rdG4#|!f+71pH!
z_RvUAfRlromGa>Vt3RSFETA>Yj14{#%ksB-ae2{*Vy9t!E33C5(@{=0$?OuM9^0NT
zWaP_It`!3OftVV69O5^{O2AfgSQ*$>4yyp;3Ux_Ju`YS!;vT?mD(_ExSH(8=p1@uz
zXR#<wslb_zO>xQv&UCDbQz>wYv8Ncvx>JaK2eGHJDf=PBQ<{&-TUqW`q&}~AiL(sb
z9PcM2Q)4AohP(>70(lKG_v&+6X^>Zt>zcGzm44X<?{^@t1N$0&KSHb@ll2Y6!9Mu@
zZ{%Xwf}F-sgPg{&4S5r_tRaTSu(6F8Sl$7~`@152&XoKV@^UW5J=BKxKgIqgWF7KK
zj(?D|e~9%K<gY|_|5JV)dGY=W?5FWJAg`fUP1H!B4lSXcrV8xwx{Y{`$vW?wz|wh2
z=c+8Sr;2s|AcXJZEBfxreyBQef6j=xA^j=bN8C?<u@2Ym8T!jQ=VbL6IK0nw`wTYs
zU~^OUPT@Yz-E&~9!+Gw*<{oVBgTwn=+b>}A05-YKUjp}Wc8`Fu4%gp+%>&ppz~TKD
zvX07T9X4ySmJ0WA{=WgnI^3fZ*sR0m2{?aJCtj*&wu*O-gwm;)yuGF05AWPC@&aEs
zTTR`Kw2^%uB(X6H2KJ~QdGFo+Px_hOI@WW@{S5M+k-F~r9WAwR?fH)9-zX|Q#Fp8t
z>(|L}=!W_*494BtMEhCOX?T9D_vzD7(w#eKlgvLEVk*SU5KAFeNBf}nTkUy{o0;R#
zwVl8p-KP=6LFRur3T%o%{wVt@ge(FTK;~b$pLlOK$@^X4IXYL_sKYKr)!@7+68aiM
zYbYo6PHtcNI#X#Y4zG$76BKhoF^d!n6l+4Ui1I<x3hn<zOh)OqN&Bfv|M&hs-TN|L
z;I#L@MzI}x1AP$qQLHBvrm5eI`fq~pT{jGp+e>OLnUxzxD>>HHB)i&=Z(iTW?kmR$
z-6(pks!Flw-%+h^yeM`<BWV(GF0b93;<f5&0SCeOwm(zF%Qy&KgWAb~7(DGrR#K*V
z5!jB=tn=thtF(=mN~dkePf?5Z=c!Sur^iTIeu{cbn5SqNW?Ly*hWr#2nE*v<%$1*v
z<F|Y?BZDpp|J8eQ4pOctte5L&RZRVBUVeV)`GZm7xcc{FH|E<JJ0tJ<T+8st8#^cb
zX}mqxv?SuI;@e|4y0r(cF14r`Q5+_Nc=1K0ica5CK0Q;{luD4@(#-1O%O{sp*H0o-
z7f>SE6(rO01l#_DhxqDhY~NqI{lrfq*Xi|gr<xDnJ2&**kv^$?({S87j|zec9LckN
zb)}vUI&Hn)F>VcrGN~hZv?nxbXYb#=27Fo<KL#B8;<tbg;OtYdB-6uNP<RidEFXry
YXr%ulU|l$C3%LSvQAduy0nIL+Tr&8IdjJ3c

literal 1239
zcmV;|1StCe01t6^ob6W2Zrer_9X<SFUCUDJwvPLt?bfAISC&N92&&pZvQZXZ)r%|)
zL7+v-AtI3mA4Z)bztmO#r9i);%WjJH-kC#@dPD)bEIRN|bMKsc?rUaXA;g*xVnxi4
zBF!x^6rl*jSaijmNU+nSS-`qXb6xa>Cwvi0i%dT^HYM<0xMCpMBv+)dnoGeZ$=jHl
z?*m&TS83`nm>U{J8q8&sjxy+mVnirgW|hx&0bM_rQ*l{N8I&_BEz2l_T5$Z%e9}?K
z&G(J8<4&e3|4}L)t+BaA(Ob|~DI+HQK&;B&?&Z~GBZ{4d^_{HRmP|uAtq|=Bq8;0w
zFJ#24Qm)Pf_=1ocd>r97)fJ#y&*_TLZRd0)=(sXnl2TolJaSPF!JEnlIp4JfzH1A7
z*B1D$E%2S{*w@aC?;ZF~WmDEuh&`H*h`lKHOVXa#yM$Q<H^=ia$$U*$vCr~4<Pzi!
z$Xx5sX{AA4LoOSVuPpsC2k&<vZ$kGC{C<d7KO*)m#KAr)LS67QhHc1c3{}W!3^m9V
z)UJvc9)Y8V7+Btcj`w#(`ur$)5Atd*#(mU=_dmsc1+or#Er&nM@gHHm4f$)4-P;sj
zM_#=D1p8_H4aghlRTDK5s6$JrC#3{FUbhkN39<9O30*qR=v);=_QbI5pQPdY^o+i{
zvLC8W+@EtoZb^Si?<4L{pko`Z+hg>XZ7zuQF)+N(b^8pQ`{1m|-YLD0bN2;wY{PjT
zfO8+52f*+?*Y-<r9)gqW{1x;*&h9aEY{T_8z<CHx0~p?aBI~F)>)@=)S}MJd^ZzY$
zY{NY|1!o<cr@;J0op`FA$uiz45(;Nx@^%(}Ke~6r$P0YkY&CT^(nj_}ki^C)7}%qJ
z<h^nGKk4Us>qO6K9_BP}SX0+MzoVrLH=gf!{;h)2Lu#4Lx_*-khi<43!(iOKOSGRg
zordSfdY?WWCEdG&Hp%>xX-uUtGmWJ*R!4iQ_gn2nj+=9i;~;Z890fKxmOqMCdCnXw
zznNR*b>g($B&YX*=jdEqqYhpQrorh@0Q5Bo)=*CBo!q|kb*{2i7+%dnOhC*D#GHj#
zfLIfVMUc0eHq-TA#AFnHn{=Iu^MA|#i!CqWy-i#GYZTkDH_!)xAH{k?VVe5wsQ)qu
zUw6YGxx1pC60O`YTFHs7Ch=-NzI^@=yU!dabff6Gsw%~zf3Jt`trx{^Xe3PnF2uE)
zQ@B<=E#M#+-}UFJcohesYfu+C5QC>3$x6ypF9X{#nspwXX_L0`RN1r*`I)t%{Y7S!
z>e&gBmY-QW1}rkP4705aEkk~04H*DKYRt8tjN@0KYdeuacZ2`xy#)s;R}{9(^|LId
z{(&y;9eMs>lsK;b!`O}aQpV26ySdOZedLXuQ~oqwU1(Yo@eT3qu^Zjl16P+;)Ql(&
zlR>=veo{rJuP2|LsoO~<$S!Bby8QCV<<#|)nyCvYHQ5y;YI%Zf|DA{U`g&|X+_?S3
zPa@ap^>U}058rDy^xcs@seRLM+<T7-f(jhVvweN7o)0>0z21oqh)m~L9_k5z8rl1I
z?*O0E<<9^|z5Es6qc{HutjNUh3e3C&QkGA`-!#&H1+bnuWlOOF@~n*<{{RfLlisld
BcIE&8

diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
index 1ab6153bb55..e98ed9e06e9 100644
--- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
+++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp
@@ -6348,7 +6348,7 @@ void tst_QRhi::storageBuffer()
         u->uploadStaticBuffer(fromGpuBuffer.data(), 0, blocks["fromGpu"].knownSize, QByteArray(blocks["fromGpu"].knownSize, 0).constData());
 
         QScopedPointer<QRhiShaderResourceBindings> srb(rhi->newShaderResourceBindings());
-        srb->setBindings({QRhiShaderResourceBinding::bufferLoadStore(blocks["toGpu"].binding, QRhiShaderResourceBinding::ComputeStage, toGpuBuffer.data()),
+        srb->setBindings({QRhiShaderResourceBinding::bufferLoad(blocks["toGpu"].binding, QRhiShaderResourceBinding::ComputeStage, toGpuBuffer.data()),
                           QRhiShaderResourceBinding::bufferLoadStore(blocks["fromGpu"].binding, QRhiShaderResourceBinding::ComputeStage, fromGpuBuffer.data())});
 
         QVERIFY(srb->create());