From dfcc55b6d5e98eb482bed54b861c51d75d223e02 Mon Sep 17 00:00:00 2001 From: Sascha Willems Date: Sat, 20 Jan 2024 13:06:04 +0100 Subject: [PATCH] Updated hlsl shaders --- shaders/hlsl/hdr/gbuffer.frag | 8 ++------ shaders/hlsl/hdr/gbuffer.frag.spv | Bin 7768 -> 4472 bytes shaders/hlsl/hdr/gbuffer.vert.spv | Bin 4432 -> 2768 bytes 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/shaders/hlsl/hdr/gbuffer.frag b/shaders/hlsl/hdr/gbuffer.frag index 4e412a75..c1fdafc2 100644 --- a/shaders/hlsl/hdr/gbuffer.frag +++ b/shaders/hlsl/hdr/gbuffer.frag @@ -27,15 +27,11 @@ struct UBO { float4x4 projection; float4x4 modelview; float4x4 inverseModelview; + float exposure; }; cbuffer ubo : register(b0) { UBO ubo; } -cbuffer Exposure : register(b2) -{ - float exposure; -} - FSOutput main(VSOutput input) { FSOutput output = (FSOutput)0; @@ -97,7 +93,7 @@ FSOutput main(VSOutput input) // Color with manual exposure into attachment 0 - output.Color0.rgb = float3(1.0, 1.0, 1.0) - exp(-color.rgb * exposure); + output.Color0.rgb = float3(1.0, 1.0, 1.0) - exp(-color.rgb * ubo.exposure); // Bright parts for bloom into attachment 1 float l = dot(output.Color0.rgb, float3(0.2126, 0.7152, 0.0722)); diff --git a/shaders/hlsl/hdr/gbuffer.frag.spv b/shaders/hlsl/hdr/gbuffer.frag.spv index 5cdc4e28b49cabf69ff50b2f168fd6b6b79560b5..022e1da11d8abd4982cc81e35c98b9e89efa62b9 100644 GIT binary patch literal 4472 zcmZXWS#y*{6o!XD0!r8gIgsUjyP*DuAxF#8K+-1t_s<>5fHi5RmQ2y#(9Ru{S1tYURUR6=9JYLH-pG~nDfB( zSEsVysADF+)0y*N7PdNOW!GDo`p$qmLY@gXcgVBg)}(CgY~ToaPDyMCd2S+))Q3C| z`PR)jWqCgGucNKo!oDE!zg>>EFMhexQkEAb_I$nd=i%01J*((4<;B1?1Ce(Ly5D|0 zQeMaNJ2GoSxsH30Z~T63YvfsmY>a-|BF}O-w_hKAE08>cz#Lvg-@vHLvx_k%C3$MU zFXj5q<%E3))!(1$m1iSA!0bJFM+@1bJ*h6>It$Yt&}NR6%&u!+D6e96?R+Xf$n2Sw z?!PKmfGl%}hT_Y>|wq#}BmXO_--;+7ar|jEO$~iXK?^@&n8uz{q#J#SEkB*L( z`(pz#eVO#xM!0)2&w9Q=&nWKIGy4;16Z2Nq%rid<^bL74+JO32 zv)KjIo73?ZYgvnHHZV8hXJ0e}@6dO{x572-lNO+DFKd|Zu~f&DYv)$-%#Q>0!eQ<1 zEn=R4n@4@bw8GU3M`cVKI%CWeF}vaFg`+a29i1`WS;Xu~xN>Pk%pN+-{@)9%-+Iii zf80X{Tz}8cyS|#9!9KV)V`H8DaP`6w>qM>tsm@&XQRF%Z*Otw72wA;wM6TUj#Tzx8O3+)u;Jtvzx-1CQL=%^m*F!u2oZ zF4b}rIsCO}{hv#Hv-vwS{@V4wl+^fp zR_epj+cJo3K6Av|G6Yv|oFl%4VYoKoFsI+~m9!tv!1ZxYaW-e+`gu0)#dmu?h?sM5 zK&nb1+LCqp?fveS%cqw9rJ6zc>T3|U)i^@5joz**Wpva3@{VK+jt(X zE#A2ixH?Ci#Rd3C3a0W|M9drLjIrK`xd>M;9NMfsV%~%sqb_1D!PN^#Wz1XXjLE)@ zZzHQ0j);l3@iMv#z>!1ZqeTR^;L@4~ei8@0U$S1%l~PQ<*AZZpWne1NQ8 zI3gx``wF^jZ-0oK?d_|`u4{kgnLh&NXaU;HzX-%{=f`k!nkV}E8eF}xj%ak+@muf}I(?Rb zpUAL=`D>tlIoLzSjm)=!`oIt9^T^+T+rS(vK-Bgv+%>gV*49C+^?wKahV`}PZTub2 Q?7rj^nDzOGsyBjv0ejL(*Z=?k literal 7768 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 diff --git a/shaders/hlsl/hdr/gbuffer.vert.spv b/shaders/hlsl/hdr/gbuffer.vert.spv index 3791964882095c68ec9858b283ad6bce2357bfbf..c55b04bcadf793579d8fbd320e010b505af50aa1 100644 GIT binary patch literal 2768 zcmZvd>r#|Q5Qaa2T{Ol68kI!F1w2Nxo)Y6(@C2x^h-l2=kH-D6smNLcN#$3p@&>#F zFU6a(G?lW-=lOP8$FCf!clv$%Fx@?~OMl<^U{S0oieh8&8=tPBqAxN1CDyvB*ziGr z{GhWW=tJ}vKx#-GAz85&S%>uVC;t$~8eU(Zul)0*%?7R&>l1E1eb|+&<0I#isuBMs z`rXSdZ1qyt_GG#HNBj4cPM0czx5mfaN9{jXJMF*G>r`Q^HFlO(+sl8oXESq|+m3qY z3?{$k>VxIxeCy84;!JDq7-szHWsjYu(l*yxn4P?ZrADXr)_uBC8WykJztUx}c;kA*yfq2%5gnjd_?f7nDZy-Cc*^}7Z z;-Q55*$=1KE$FVmThYxeHufu|D4tykysg9^?b}QI@>SS(^zg(H-k|3VBgW{bZJ4}Y zvs;^WjikGg3mHj0dlwD7zG1h2=OEt6ZjI&_?_#$nbBcE-tbHqyzLQZr_OPq#(_lBJ zXIj%JyZ+X6j!)0@P3a@{O!YMx_RPT6V62?}*5Dh@v2Q%bzJnb5#&g{JeJhG4ti6pP zr^sp#p6jxww^TOHet~oCVJ~8>f%l=C_YI%>*>Vj2<}Yc?9-Z@@ma)p{k8l3jGE4&YxlhWn2vYrU3#Zc<9YPY)p!A3 zTlihf{PH`$1g|Y>oIrODuHYuo!GCob>h3fu&uzxKSBt6=S(7yVsBm$%luKl^;m ze+1`q9T`K$5$EAMHZGsR6gXy(_cjf$E&7;2ul9B$ad~ey6PNdP3(k1`wdcLfg0*{I zyu~?mdBtUZ^I401wGjPX5i?)vJ)3+r<~E!$@)5IuF0Z(%F?ZmM@$86MM3+}w)tI|* z#^m3vdtiCR6*2MM`U%eZt;hWO$35Ri_cu$QsNrXHdBqj^o->~z@Gr-&OY7YwvTRe#D&SEUU}1Y+N=*#hRFnD46;j zOOMaS9BqDEm4T`|yu0ypLryVg~PhX#g+ zH`)}yl2yV*#?z^!%xNWOJd0wrSy{xGY_H}QwR*kc_uHK%@yLz@9 z$+xFfy_Z}%B+0UuR-$=r&{;zHw-=wZ)!MT#vLeQNM3vUjxykeiDuw8*CVcSRG$=IGn z>^@VFEZccr_@{#0JN(mhvjR`g(KUMlA6>&s=JO8iZw6wHar&a}Ol;p%;91z7c{+c$ zp*^FxwRi_|A+2=ee7*NJqK-j(203v%x(;!F@ocnbu%_6166>Et=5gqDnB&pft;G19 z#eB_~3-%4jw}a0>J8OCUi_!Y!#Ag*adRPj!$LM)kf!olYxq>#B&Z9RKF8|)eV zUaTQ*FYLMmd#1pi*;;bO&p|uy6#MpT%tjug~S4&L(nh$F`1q@&D03(omFEARd(#C+rRPeEc1Ph;!1C;Qoieg?50d-j}S;|_AG`_R5g-)5Zq zIqdSepNErA-{cEm`8fBB*yVeA2~IxF^D?%aE4Wv%<c>U?QUkB^A zr?~$&u;mq(^{p5EzKQKz;{L_v#2ntjF3;g@IC*Co-{w2m@{#v0b~*1oIQevb?}O!| zpAWFh^ZO7^K4$e1wwx=tkFn*_`F&Dw>HPM>nQy%Qbbg01&Tm%b(6RLtTF?D8zWgp*Ha@fBD;X7M$4c^2Qm$;Y|B#g=mg_Z_xeI*acME}g{> zaONAYKb^&oVEy(KZ|Ns&dBtUY>qWmmW2bLPY);JK7wqyJeua}y=kOa?-t&w@|BlGH zqL)9gn4E3R_RUvTEsBaw3mTV8QRPW;aQ z4QK!MV}0XehKI4e^GQhjZvKNUA8+zsY&q-1o^B$qxMI(!TLZ(>bKy_xw!q0>S^VE-B(_}S zjKa3&tfHpa7<(TJH@fh<-|hm3?-a0HypdC}