From fc9753a8fc259bbaf74c81a98355c0a420b2038c Mon Sep 17 00:00:00 2001 From: Vovan675 <31342770+Vovan675@users.noreply.github.com> Date: Thu, 20 Jun 2024 22:56:26 -0700 Subject: [PATCH] Fix SSAO blur range (#1122) * Fix ssao blur range * Recompile ssao blur shaders --------- Co-authored-by: Vladimir Kosachev --- shaders/glsl/ssao/blur.frag | 4 ++-- shaders/glsl/ssao/blur.frag.spv | Bin 1868 -> 1868 bytes shaders/hlsl/ssao/blur.frag | 4 ++-- shaders/hlsl/ssao/blur.frag.spv | Bin 2348 -> 1748 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shaders/glsl/ssao/blur.frag b/shaders/glsl/ssao/blur.frag index 7385a766..f26c8453 100644 --- a/shaders/glsl/ssao/blur.frag +++ b/shaders/glsl/ssao/blur.frag @@ -12,9 +12,9 @@ void main() int n = 0; vec2 texelSize = 1.0 / vec2(textureSize(samplerSSAO, 0)); float result = 0.0; - for (int x = -blurRange; x < blurRange; x++) + for (int x = -blurRange; x <= blurRange; x++) { - for (int y = -blurRange; y < blurRange; y++) + for (int y = -blurRange; y <= blurRange; y++) { vec2 offset = vec2(float(x), float(y)) * texelSize; result += texture(samplerSSAO, inUV + offset).r; diff --git a/shaders/glsl/ssao/blur.frag.spv b/shaders/glsl/ssao/blur.frag.spv index 723774358f0f199a2b50b3f28538ae46b796ff72..4556dfac61235b6b80c1d1056a2c3dcd4122986f 100644 GIT binary patch delta 31 ncmX@ZcZQFXnMs+Qfq{{Mdn0E!3*+X=i7e%en>XKNDP{ryZEFYW delta 31 ncmX@ZcZQFXnMs+Qfq{{MeIsW$3**Mgi7e%e8#mu%DP{ryZ2t%1 diff --git a/shaders/hlsl/ssao/blur.frag b/shaders/hlsl/ssao/blur.frag index e370ddd6..f0ce9234 100644 --- a/shaders/hlsl/ssao/blur.frag +++ b/shaders/hlsl/ssao/blur.frag @@ -11,9 +11,9 @@ float4 main([[vk::location(0)]] float2 inUV : TEXCOORD0) : SV_TARGET textureSSAO.GetDimensions(texDim.x, texDim.y); float2 texelSize = 1.0 / (float2)texDim; float result = 0.0; - for (int x = -blurRange; x < blurRange; x++) + for (int x = -blurRange; x <= blurRange; x++) { - for (int y = -blurRange; y < blurRange; y++) + for (int y = -blurRange; y <= blurRange; y++) { float2 offset = float2(float(x), float(y)) * texelSize; result += textureSSAO.Sample(samplerSSAO, inUV + offset).r; diff --git a/shaders/hlsl/ssao/blur.frag.spv b/shaders/hlsl/ssao/blur.frag.spv index 05136819ffac14892ddcd688629d24df72538681..cf2ea7e525d3f073bce54e0057d44f9826f4a4f4 100644 GIT binary patch literal 1748 zcmY+ESx;0!5QSS{KxLOrKxGD80Y^kY6xjqEA4oukpl@apCWJ(mz+g1-0pI*T{x*%8 zD1P7Nwi!D)Q&p#``<||9sI3`l2;o8qp(VWJ*VP_s5=J{t+!*SUxUgDW%^z2`^AnR} z*0qFMO_FO34WSOd2JDq~_vOvXwc*M0A-vj&@vxj9-_Gyum3GR+nIr>W z{!lqNDi@23YYF52r1rS9clfS+M3~fG#HLhQ+mL*FcR&BWbd=v*d9$>(wy~UO&ZIgI zPAW;Vxb=2(aig%ZnVePkpMGmE!B>6rpU46?^L{sg%h?~E@EeotQ_M182_jZWXH<)tH^%b0Yhf*FBKC#a` z-URZo<`%wt)fH=QbaZpU#L;vJ>WZ#|B3cttas3UV|spj1gOt@ zje`5Yob$>9-;B8jAm-dR27Eu}9s+Y;`L1*D|BQLx_jj~C!kTyeA~rt(>*dv_Z;$QCEbwkI zp2PPn=VH(2fi?2J3;!k-fbXt}UuzbDv$YS_JEttz;tb#KbC3fI;59F*2fGC1-RttL zsAn0NbA3)Zdtqu;1*5Qh)FuvE0IatDDHqKSc2!v|wxfHXk(Sfr)!jVxhPR@t^GTP})Fko!$8 z3Mw~2(9isH1W2Gf&%0;Hi>H~+{C+cM=FFV)ZhPC>N=kE5O5N!{{<}U-Z3Uy=0Parh z1#eVOs-zCIcB5J!*U^R;(aV2%5@NNdPV_#UooOyPQ)(WYtPO0~KTvN}$7;^^ z9c@le)rN-$hlznIf}fbK)|Y0pPe zn%TSr{2`W{xz^LE_#?y^CH8bQx+`o|jo6svblW)fN{w*=~Zx1f9eS6O?v3+irDWa=A=)o9p~2e%)V>)I7fc~oZ%S#JM%-CGv+%u z@1U7^R60(ycRY>A4-#W9hY|aCpLN8>M2;ia=61f3<0!U#tPiLPx>imLjOyD!v<+^9V#>iXuKKd`jWnKN} z5P9orN3QeO_T=pR<}M&|;lGG&?eJg1mfMkMdl}n3^6qioR}g1>Hpg7WHcsAteZO+X z`_`@@9U1%E^ef``8u_kc`)&i@z&6LJoc|`aG4i8u{ubOq%xkXQ+@9a^Z-~6{F5jR% z|BmQ$SwrqN;@hx>_)g}Gjdvqwyl>+V