From 59b6c5ef5cb6bbd80dcafae2d4b95a2efff32de9 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 15 May 2011 22:30:20 +0000 Subject: [PATCH] - Removed a couple warnings about implicit vector truncation reported by fxc. (Apparently, it also decided to compile some other shaders slightly differently, too.) - Fixed: The InGameColormap had been designed without taking alpha into consideration. As the least likely parameter to be used, desaturation has been moved into a constant register to make room for the alpha parameter to live in the vertex's color value. SVN r3208 (trunk) --- src/win32/fb_d3d9.cpp | 16 +++++++++++++--- src/win32/win32iface.h | 2 ++ wadsrc/static/shaders/d3d/shaders.ps | 17 +++++++++-------- .../static/shaders/d3d/sm14/InGameColormap.pso | Bin 208 -> 196 bytes .../shaders/d3d/sm14/InGameColormapDesat.pso | Bin 320 -> 328 bytes .../shaders/d3d/sm14/InGameColormapInv.pso | Bin 268 -> 256 bytes .../d3d/sm14/InGameColormapInvDesat.pso | Bin 336 -> 344 bytes .../shaders/d3d/sm14/InGameColormapPal.pso | Bin 336 -> 324 bytes .../d3d/sm14/InGameColormapPalDesat.pso | Bin 432 -> 436 bytes .../shaders/d3d/sm14/InGameColormapPalInv.pso | Bin 380 -> 368 bytes .../d3d/sm14/InGameColormapPalInvDesat.pso | Bin 448 -> 452 bytes wadsrc/static/shaders/d3d/sm20/BurnWipe.pso | Bin 300 -> 300 bytes .../shaders/d3d/sm20/GammaCorrection.pso | Bin 328 -> 328 bytes .../static/shaders/d3d/sm20/InGameColormap.pso | Bin 256 -> 256 bytes .../shaders/d3d/sm20/InGameColormapDesat.pso | Bin 368 -> 388 bytes .../shaders/d3d/sm20/InGameColormapInv.pso | Bin 316 -> 316 bytes .../d3d/sm20/InGameColormapInvDesat.pso | Bin 384 -> 404 bytes .../shaders/d3d/sm20/InGameColormapPal.pso | Bin 396 -> 396 bytes .../d3d/sm20/InGameColormapPalDesat.pso | Bin 492 -> 512 bytes .../shaders/d3d/sm20/InGameColormapPalInv.pso | Bin 440 -> 440 bytes .../d3d/sm20/InGameColormapPalInvDesat.pso | Bin 508 -> 528 bytes wadsrc/static/shaders/d3d/sm20/NormalColor.pso | Bin 252 -> 252 bytes .../static/shaders/d3d/sm20/NormalColorInv.pso | Bin 312 -> 312 bytes .../static/shaders/d3d/sm20/NormalColorPal.pso | Bin 392 -> 392 bytes .../shaders/d3d/sm20/NormalColorPalInv.pso | Bin 436 -> 436 bytes wadsrc/static/shaders/d3d/sm20/RedToAlpha.pso | Bin 272 -> 272 bytes .../static/shaders/d3d/sm20/RedToAlphaInv.pso | Bin 328 -> 328 bytes .../shaders/d3d/sm20/SpecialColormap.pso | Bin 364 -> 364 bytes .../shaders/d3d/sm20/SpecialColormapPal.pso | Bin 488 -> 488 bytes wadsrc/static/shaders/d3d/sm20/VertexColor.pso | Bin 124 -> 124 bytes wadsrc/static/shaders/d3d/sm30/BurnWipe.pso | Bin 300 -> 300 bytes .../shaders/d3d/sm30/GammaCorrection.pso | Bin 328 -> 328 bytes .../static/shaders/d3d/sm30/InGameColormap.pso | Bin 256 -> 244 bytes .../shaders/d3d/sm30/InGameColormapDesat.pso | Bin 368 -> 376 bytes .../shaders/d3d/sm30/InGameColormapInv.pso | Bin 316 -> 304 bytes .../d3d/sm30/InGameColormapInvDesat.pso | Bin 384 -> 392 bytes .../shaders/d3d/sm30/InGameColormapPal.pso | Bin 396 -> 384 bytes .../d3d/sm30/InGameColormapPalDesat.pso | Bin 492 -> 500 bytes .../shaders/d3d/sm30/InGameColormapPalInv.pso | Bin 440 -> 428 bytes .../d3d/sm30/InGameColormapPalInvDesat.pso | Bin 508 -> 516 bytes wadsrc/static/shaders/d3d/sm30/NormalColor.pso | Bin 240 -> 240 bytes .../static/shaders/d3d/sm30/NormalColorInv.pso | Bin 300 -> 300 bytes .../static/shaders/d3d/sm30/NormalColorPal.pso | Bin 380 -> 380 bytes .../shaders/d3d/sm30/NormalColorPalInv.pso | Bin 424 -> 424 bytes wadsrc/static/shaders/d3d/sm30/RedToAlpha.pso | Bin 240 -> 240 bytes .../static/shaders/d3d/sm30/RedToAlphaInv.pso | Bin 300 -> 300 bytes .../shaders/d3d/sm30/SpecialColormap.pso | Bin 352 -> 352 bytes .../shaders/d3d/sm30/SpecialColormapPal.pso | Bin 476 -> 476 bytes wadsrc/static/shaders/d3d/sm30/VertexColor.pso | Bin 124 -> 124 bytes 49 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp index 08f2e2ed4..ff1c0d9c6 100644 --- a/src/win32/fb_d3d9.cpp +++ b/src/win32/fb_d3d9.cpp @@ -3293,8 +3293,8 @@ void D3DFB::FillSimplePoly(FTexture *texture, FVector2 *points, int npoints, quad->Flags |= BQF_Desaturated; } quad->ShaderNum = BQS_InGameColormap; - color0 = D3DCOLOR_ARGB(colormap->Desaturate, - colormap->Color.r, colormap->Color.g, colormap->Color.b); + quad->Desat = colormap->Desaturate; + color0 = D3DCOLOR_ARGB(255, colormap->Color.r, colormap->Color.g, colormap->Color.b); double fadelevel = clamp(shade / (NUMCOLORMAPS * 65536.0), 0.0, 1.0); color1 = D3DCOLOR_ARGB(DWORD((1 - fadelevel) * 255), DWORD(colormap->Fade.r * fadelevel), @@ -3532,6 +3532,10 @@ void D3DFB::EndQuadBatch() { break; } + if (quad->ShaderNum == BQS_InGameColormap && (quad->Flags & BQF_Desaturated) && quad->Desat != q2->Desat) + { + break; + } indexpos += q2->NumTris * 3; vertpos += q2->NumVerts; } @@ -3593,6 +3597,10 @@ void D3DFB::EndQuadBatch() select = !!(quad->Flags & BQF_Desaturated); select |= !!(quad->Flags & BQF_InvertSource) << 1; select |= !!(quad->Flags & BQF_Paletted) << 2; + if (quad->Flags & BQF_Desaturated) + { + SetConstant(PSCONST_Desaturation, quad->Desat / 255.f, (255 - quad->Desat) / 255.f, 0, 0); + } SetPixelShader(Shaders[SHADER_InGameColormap + select]); } @@ -3704,6 +3712,7 @@ bool D3DFB::SetStyle(D3DTex *tex, DrawParms &parms, D3DCOLOR &color0, D3DCOLOR & stencilling = false; quad.Palette = NULL; quad.Flags = 0; + quad.Desat = 0; switch (style.BlendOp) { @@ -3812,7 +3821,8 @@ bool D3DFB::SetStyle(D3DTex *tex, DrawParms &parms, D3DCOLOR &color0, D3DCOLOR & quad.Flags |= BQF_Desaturated; } quad.ShaderNum = BQS_InGameColormap; - color0 = D3DCOLOR_ARGB(parms.colormapstyle->Desaturate, + quad.Desat = parms.colormapstyle->Desaturate; + color0 = D3DCOLOR_ARGB(color1 >> 24, parms.colormapstyle->Color.r, parms.colormapstyle->Color.g, parms.colormapstyle->Color.b); diff --git a/src/win32/win32iface.h b/src/win32/win32iface.h index fc75af0a3..5314fc667 100644 --- a/src/win32/win32iface.h +++ b/src/win32/win32iface.h @@ -296,6 +296,7 @@ private: }; DWORD Group1; }; + BYTE Desat; D3DPal *Palette; IDirect3DTexture9 *Texture; WORD NumVerts; // Number of _unique_ vertices used by this set. @@ -304,6 +305,7 @@ private: enum { + PSCONST_Desaturation = 1, PSCONST_PaletteMod = 2, PSCONST_Weights = 6, PSCONST_Gamma = 7, diff --git a/wadsrc/static/shaders/d3d/shaders.ps b/wadsrc/static/shaders/d3d/shaders.ps index a650cd84a..827b52855 100644 --- a/wadsrc/static/shaders/d3d/shaders.ps +++ b/wadsrc/static/shaders/d3d/shaders.ps @@ -6,6 +6,7 @@ sampler1D Gamma2 : register(s3); sampler1D Gamma3 : register(s4); #endif +float4 Desaturation : register(c1); // { Desat, 1 - Desat } float4 PaletteMod : register(c2); float4 Weights : register(c6); // RGB->Gray weighting { 77/256.0, 143/256.0, 37/256.0, 1 } float4 Gamma : register(c7); @@ -70,15 +71,16 @@ float4 SpecialColormap(float2 tex_coord : TEXCOORD0, float4 start : COLOR0, floa float4 range = end - start; // We can't store values greater than 1.0 in a color register, so we multiply // the final result by 2 and expect the caller to divide the start and end by 2. - color.rgb = 2 * (start + Grayscale(color) * range); + color.rgb = 2 * (start + Grayscale(color) * range).rgb; // Duplicate alpha semantics of NormalColor. color.a = start.a + color.a * end.a; return color; } // In-game colormap effect: fade to a particular color and multiply by another, with -// optional desaturation of the original color. Desaturation is packed into color.a. +// optional desaturation of the original color. Desaturation is stored in c1. // Fade level is packed int fade.a. Fade.rgb has been premultiplied by alpha. +// Overall alpha is in color.a. float4 InGameColormap(float2 tex_coord : TEXCOORD0, float4 color : COLOR0, float4 fade : COLOR1) : COLOR { float4 rgb = SampleTexture(tex_coord); @@ -86,17 +88,16 @@ float4 InGameColormap(float2 tex_coord : TEXCOORD0, float4 color : COLOR0, float // Desaturate #if DESAT float3 intensity; - float invdesat; - intensity.rgb = Grayscale(rgb) * color.a; - invdesat = Weights.w - color.a; - rgb.rgb = intensity + rgb * invdesat; + intensity.rgb = Grayscale(rgb) * Desaturation.x; + rgb.rgb = intensity.rgb + rgb.rgb * Desaturation.y; #endif // Fade rgb.rgb = rgb.rgb * fade.aaa + fade.rgb; - // Shade - rgb.rgb = rgb.rgb * color.rgb; + // Shade and Alpha + rgb = rgb * color; + return rgb; } diff --git a/wadsrc/static/shaders/d3d/sm14/InGameColormap.pso b/wadsrc/static/shaders/d3d/sm14/InGameColormap.pso index e1a99904ba688c6dda494122b2431a1a99d20b9f..18a747196229fc5495350f3b2745dadb06afc043 100644 GIT binary patch delta 43 scmcb>c!Y7n0u=@Z_67!qCk>1Y|0ggqJek1C00R7AF`)Q_|Nj{n0316FMF0Q* delta 55 zcmX@Yc!6=k0s}?{_67!qCk>1Y|0ggqJON?`2L=WXpxFNgRt6AY2g*HZ0IHer|33o* E0I``5lK=n! diff --git a/wadsrc/static/shaders/d3d/sm14/InGameColormapDesat.pso b/wadsrc/static/shaders/d3d/sm14/InGameColormapDesat.pso index 2bafecca0f56d2eae3937a69541cd54e375c17f0..9eedbdadc595f2e372145f5fbcafea3636b7d36d 100644 GIT binary patch delta 231 zcmY+6I}XAy5JYE(qB%z3h>j-)#b0iDxYbR2 zt((*3j1YpbC9vA-)|1Yy_7z)#$^p?8i2X2MDf2Ga_BQ{QPLK$C!<>46dQp8(_1XhQ KPVW$(67U09;4CBn delta 221 zcmXv`u?+$-5c3@&{~Zg^Q?Uc^G%rz7QZfPs5<lm-}iVj0l2v{K{jz`i`JafRzZF sdTRaZnj-2n|7nGJCI@Ok$9GLa&;7qA&C6s08?@cz8(_!(*~@0Y2mD7XT>t<8 diff --git a/wadsrc/static/shaders/d3d/sm14/InGameColormapInv.pso b/wadsrc/static/shaders/d3d/sm14/InGameColormapInv.pso index 0cf0808b0f3b7cfb80769ba716b43e06c262c7f8..4122e261aa1d6872ce47ee7eb251e505df9f20a9 100644 GIT binary patch delta 43 rcmeBSYG9ghM}>iby@8S82@wCE0Hi0dGJpVo0|QVDh$sC2&%gix4@C_8 delta 55 zcmZo*>S3C2$AFQ6y@8S82@wCE0HlGK!GVE+qk)0pe*-H62tec+fO7x;GcW)Ep*Igo diff --git a/wadsrc/static/shaders/d3d/sm14/InGameColormapInvDesat.pso b/wadsrc/static/shaders/d3d/sm14/InGameColormapInvDesat.pso index 286c765e2ff9e188e6ea0e67fea53af9c1cfd62c..4b2b2268a4a1da785cba53afb39a2982245f4d7b 100644 GIT binary patch delta 241 zcmY+6Jqp4=5QX2YF-hkIY`ucLKb>HuV4FhGMnNOkx!z#Y*|~i#W9b2M4#zh^1P9&@ z@7wq0>0a)di0WI1m@G!)K7a>htix>{0^GS)l%o;8TjQJyWjRLRDVsn!q<^{T`c#zX zV^Qu7d(?F;YzY$URkK0m=bOv}%`Jt-yzS>+(D)Qh?0&t2k|8Gaf~@@)ETeH__%RLa O2I~Pm&%36e3VZ;-A20;~ delta 232 zcmYL?y$wP!41~{42=+F;AMj+u@EH#WDd+3kg#;JzSEuk z)Q4`On7wR{)qb&@0ytCdDYr8OIB~71@I`F7eGZf&F`_uu%WNWy2%>j<>V0?31+bc6 z121-pF}dBGGZO*1C|XHq!|2BW=AAy0g?S-+#{Iw7-0uaALI>Vqr}zzgI<4?eZ^3{! D!Z$Bx diff --git a/wadsrc/static/shaders/d3d/sm14/InGameColormapPal.pso b/wadsrc/static/shaders/d3d/sm14/InGameColormapPal.pso index f6a6a6fba8b12b4151e30f9546a2141481fde074..d8294f66302a8b376b42d059dbadf38888754cde 100644 GIT binary patch delta 44 qcmcb>bcAVx0;38e1A7A_!xJF>KLJQjU}XRSey|t=kpKTb0|NjNObqJ) delta 56 zcmX@Ybb)Du0;2%~1A7A_!xJF>KLJPsF@pmG0|$uTz{&su>;rgG%2IZnVSoqQin8s94ZGH!vNX_wg96rxN_Y%) zjs&I~B4F)DWk!DR?d=Q}45 h^;G(8psV-jQT}6rOe*eDC;-h7ry1=|aNwH=@B!3wHWUB= diff --git a/wadsrc/static/shaders/d3d/sm14/InGameColormapPalInv.pso b/wadsrc/static/shaders/d3d/sm14/InGameColormapPalInv.pso index 3964f59dcea5ddd9a0f80f8981e8bc4d9a57b4e7..e94efa48aa079f4bc74b95fb341da5e7fa5c6fde 100644 GIT binary patch delta 44 vcmeyv^nq!E52Fer1A7Al!;=O^hW`^78JE006y) B54ivU diff --git a/wadsrc/static/shaders/d3d/sm14/InGameColormapPalInvDesat.pso b/wadsrc/static/shaders/d3d/sm14/InGameColormapPalInvDesat.pso index 7a3850318dc753577d73927889a46965d178c7d0..c75fd148d30048dce37d1f312d9c0bfb0b5e3055 100644 GIT binary patch delta 284 zcmY+8u?@m75JmqbAxXyq)QmtMpkM$PAO%P?ARyG34HB_{OQbA7nIZ$wQ<91yF#lYD zIO+L(-~Ybcgl%|=#JRVdVKUFg0{}0gT8~|42=HVxB;X)COWw6C2?;H@60I8vy$@(q zVBJaJw|~12uf@Z^!0Gak7sq{GthXD~buB(Bf>gV4)n=DeMytdKx^oO?Qy-BUpffQ# mt6vU~ngEU-*oZTb7=0Hktm>-CS92w^O5FqcnrrASodZ4wtTpuj delta 295 zcmY*UF%H5o5ObPRI`RM>zylC-DHA&%U_dOeu@fXlhE}W$9g#A!Fm^!VBN5Nw@TEwI zi!8^E&r%+?wfoeFyrsZwF)fDxo`iZSSv3sMk~W0xBz9z-BVid}1Sd5(7b4*?#5Fp= zJ$l)nH{UMTEBN|09(WU5(%8dj{VJ{Z{yZ|1eeM9MGf0yFMS{LF2nW?UlNPy45L|}P m^uF3cbf?k}fO+0yM*W``*drCY2ozuswbPDnCphp;tNAkVp4d6*^R-;&t3-F*UiGuLCSlgU)BDN>oXsVqXQS1nU ze{Z@vBtwpy81_a{*cF$%&!6h!B5)=jXn6vW;}QiLd4Mr{O3OPheLot+3Pcz`TkAmFiVa{y1^I=h8_ zcnmXt{=X-0wT1Hj#PRn4!7AhUpX2EOe@pVD_$;BEHXch;b5HJ}A)-0`Ln_WoJC30V{V KAoLz58GZqnMJZGO diff --git a/wadsrc/static/shaders/d3d/sm20/InGameColormapInv.pso b/wadsrc/static/shaders/d3d/sm20/InGameColormapInv.pso index be962db512d2398dcf3b91e533cfec872320bf54..98ff0cc387e18e6056ad1f138c3d2a453b5c2e45 100644 GIT binary patch delta 93 zcmdnPw1;WJS|xKmOH(5~V*?{226+YsCI$wE1_lP^4G1>>#PhZW3=HfIj0{hJ`2PeT bJ%JUdhJk?}sPqX41I2(^IUxN1{}~tnmxvVu delta 93 zcmdnPw1;WJS|u|*OH(5~BMTD~26+YsCI$wE1_lP^4G1>-#PhZWj124zj0{hJ`2PeT cJ%JUdh5;(Z0OT`*v~utRwLWS1|DS;Y0GMDD{{R30 diff --git a/wadsrc/static/shaders/d3d/sm20/InGameColormapInvDesat.pso b/wadsrc/static/shaders/d3d/sm20/InGameColormapInvDesat.pso index 8387b5b80b51b6f0fcb75b24ad7bd89ff69e620c..3605fb6ba5d21add10d9310897012fb097a4863b 100644 GIT binary patch delta 251 zcmX|)u?oUK5JYE_m;@Uun_z2ckVp_qjbLFVDA=YDv{BFqc3%DhfE z;NP2WPHA>NrrGYWM^#nCw+Ie{a^5XfuQ?1yaTE^vQB=NWiKl=%cVV>89}s*+sFjOa kH@@EcdcsOOfI|>(7-;E9hTDSLK}+5d3f@`pf8H421BEUzV*mgE delta 226 zcmXwxy$ZrW5QOLUVhlExg4o+giV#Ihe?SCF%anGub`rR}K@NR@fRAN+&*3>6aN%Qa z_Gag0ojpNf{Kf_Lm+fu_;6ZdJ6!mC;JLNzuF%X=oIu#M5+)Z)y^?Ym?F-S;1{+*9j z`DR(<#kws0=XlE;5Pgc+vELdD=|iJ_Kri$Lkp!3ZKI`8pLYDxE=7s<4XoZ>oPV>BL Nsjc=vd!DtK`~ZehEUW+k diff --git a/wadsrc/static/shaders/d3d/sm20/InGameColormapPal.pso b/wadsrc/static/shaders/d3d/sm20/InGameColormapPal.pso index 0eed147cd96f948e470811f29746b4903dc385cc..bccbbc004694a664aab6803c4634d163b44aef59 100644 GIT binary patch delta 93 zcmeBS?qQyASIJz@($q-L*ucn$L7stuiGhKkfq{W}1A@&z@qerV0|Pry_(=mJ!~Y44 c3{NJo0@W}u@PoyG;y^K=Rt^aN|9=Js0F~kuBme*a delta 93 zcmeBS?qQyASIJDz($q-L$il>gL7stuiGhKkfq{W}1A@&y@qerVBLh27_(=mJ!~Y44 d3{NJo0@W}8#ei&(I8Y3zm4hFw=Kp^N1^|}26(9fr diff --git a/wadsrc/static/shaders/d3d/sm20/InGameColormapPalDesat.pso b/wadsrc/static/shaders/d3d/sm20/InGameColormapPalDesat.pso index 8029e484e4388e0e7f9c13b361a34c19881868f4..3f08538b121bf172e05d21a95d3a47f1ced9c09c 100644 GIT binary patch literal 512 zcmZuuu}Z^G6g@AAF{qGT1T*SVN<^fitwV(t#43&@*w_YIQfUL3Ka^(Dx!-6Pe(WVrk(UJFBZ{IBYLY=u9hVDl>T|)s zp4wrfUwLysNqiXC{ZAi;6Wsa1be6_LoTKYwr#~1CoYBmi_>t2K z7t3Hy(rLM8tbq)IJm)qHf3p6}~W#?->6XacWO?C>DD_CW2fWHcz zHBt`EHQfI7q=Fuc1_4XYU6vn@s#u!w{E`k|#2@0(-oCSV|=SL>P9 zA`!6gq6zRuZ*U9j;JslVnptG~8+JVprXkAG#GY0VP47(*hglZF#O{B5kW5eteX7ZN zz3#(kI?GZl(y>22!615ACTa4RxktCh?p1%-cZaiJ5-#0dGG9b7gO2B)d7V?=^UvFD z9I7h=IbXB>i=E;(7TClEY-iQ*LNM;?Z*e$VtzlOy3h|o^=JM5oT=5@G-j_LY)>t3u z8EWPNRW3NQrDwL;Gt$h~xvgUhmDT`MT`DVhR<3kwMh!A*6-r0wzKVSn8Q*2s=ST_s E04{`B=Kufz diff --git a/wadsrc/static/shaders/d3d/sm20/InGameColormapPalInv.pso b/wadsrc/static/shaders/d3d/sm20/InGameColormapPalInv.pso index acdd60934ebb4dd951699dbf5cb176a32265d1c3..14c602bc42b28ec6928b8e2a59eccfe4da27d006 100644 GIT binary patch delta 75 zcmdnNyn}hdPbG6bOH(5~V*?{226+YsCI$wE1_lP^4G1>>WNF4+Nd^Y?21bS_K>U9K Tke-WNF4+Nk#_t21bS_K>U9K RkeF{&e4h7etAjTj?z!ikd*4T3DfOi~Xy2T-4gh=-pti-NYb<~drkt=K__-*^bx6V{ z1XrG!b-WPvkMC6rj5oqE-8-A!ccZyn?Bg(QAW|BkCDlVttDB^;H zJ+s4FzX~T&mPK%|`=8!RhPaF3(Kt&nO9#QAfnIz+PtxQe^N+5N{Z6;v_50&+7|s25 zGM&W}l4d#_D*R^23o~iu;ih$JmY9Fm>k1Ci8 S-3OSn=-JeGFK<;V1$+Z>$6-kT literal 508 zcmZutF-yZx5dK~o)1X3k5zMGdkWj@=V!J4`AlBkof{ksUC8fy^NWsw|?hYM=EFB%) z{3Gvo`25~$tcx!kclX_W-(3!tQs3$lo%^fyA%HI$h}m>H#}fFYo6>4D0Sg(ue$TWT z5djA;1_9paEq(&Kc(1SzgE_g}Tm{nzLgx>f{W_k-2Mf*TfE_(FFTBLtDYwxt_DZs7Z`kh1LO6CTg delta 20 bcmeyv_=j;qBbS+;rKypgk%fuL#O^`>OB4pD diff --git a/wadsrc/static/shaders/d3d/sm20/NormalColorInv.pso b/wadsrc/static/shaders/d3d/sm20/NormalColorInv.pso index e18767e87b2a0751847781eb9020fd432c854e56..da470159a030befc9a068940599a5d98369b9d30 100644 GIT binary patch delta 20 bcmdnNw1a8FS}t=vOH(5~V*?|jiQ5|iL+%ED delta 20 bcmdnNw1a8FS}rp^OH(5~BMTFgiQ5|iL>vZ* diff --git a/wadsrc/static/shaders/d3d/sm20/NormalColorPal.pso b/wadsrc/static/shaders/d3d/sm20/NormalColorPal.pso index 68a1f3fac03b91f32637b6e13418ea9733dbd30f..57b34eb352a80bd980f4ce863cc5892d58933d0b 100644 GIT binary patch delta 20 bcmeBR?qHs9m&;tw($q-L*ucnW;`4<7Ktcwg delta 20 bcmeBR?qHs9m&;7g($q-L$il>A;`4<7KyU`D diff --git a/wadsrc/static/shaders/d3d/sm20/NormalColorPalInv.pso b/wadsrc/static/shaders/d3d/sm20/NormalColorPalInv.pso index 8276561f0ca5015b62818d119d61837dcf3dafc2..2c490574c0cc749eb586872d6d90169a2a0c9de6 100644 GIT binary patch delta 21 ccmdnOyoGtfPcCykOH(5~V*?|j$;^x!0ZdQ^L;wH) delta 21 ccmdnOyoGtfPcAb(OH(5~BMTFg$;^x!0ZfPnP5=M^ diff --git a/wadsrc/static/shaders/d3d/sm20/RedToAlpha.pso b/wadsrc/static/shaders/d3d/sm20/RedToAlpha.pso index cd74d5586649502f99a1b0f90346e166ff820302..10fa58af8b6e22d4626f2c64cada5879fa92533a 100644 GIT binary patch delta 20 bcmbQhG=XVCBbT|JrKypgv4N4%#O_uAI~E1o delta 20 bcmbQhG=XVCBbS+;rKypgk%fuL#O_uAJ46NL diff --git a/wadsrc/static/shaders/d3d/sm20/RedToAlphaInv.pso b/wadsrc/static/shaders/d3d/sm20/RedToAlphaInv.pso index 1aeadb9fb3156940f409752b6904e5e73b268672..792ffbf35d0c14158b742e8906993afd0dd1c536 100644 GIT binary patch delta 20 ccmX@Xbb@KZS}t=vOH(5~V*?|jiQ6Xv07hO0uK)l5 delta 20 ccmX@Xbb@KZS}rp^OH(5~BMTFgiQ6Xv07i@kxc~qF diff --git a/wadsrc/static/shaders/d3d/sm20/SpecialColormap.pso b/wadsrc/static/shaders/d3d/sm20/SpecialColormap.pso index 4258efed5d64e72e120d184926a2394f6d01b6d8..24ebb375ae3e9bb767c04aa0ef8e4269faadeb0f 100644 GIT binary patch delta 20 ccmaFE^oD7|S}t=vOH(5~V*?|jiQBgV0882j8vp(^b diff --git a/wadsrc/static/shaders/d3d/sm20/SpecialColormapPal.pso b/wadsrc/static/shaders/d3d/sm20/SpecialColormapPal.pso index d8c347c63f12f0fbc2ade8878cb1e3f55d46ed62..b706962aa1f4b7b505841e6ee10a797788f80722 100644 GIT binary patch delta 21 ccmaFC{DOJHPcCykOH(5~V*?|j$;^yT0aT<0-~a#s delta 21 ccmaFC{DOJHPcAb(OH(5~BMTFg$;^yT0aV-u>Hq)$ diff --git a/wadsrc/static/shaders/d3d/sm20/VertexColor.pso b/wadsrc/static/shaders/d3d/sm20/VertexColor.pso index 7f899a57b11d8b350afb5bd61e10059502dafc43..bd62a1d299fa15b6830567b39ca4019d2a847aab 100644 GIT binary patch delta 18 Zcmb=anGnilu4id#q-ShkWHd2e763C01n&R< delta 18 Zcmb=anGnilre|qtq-SJdVlpva763Ck1o;2} diff --git a/wadsrc/static/shaders/d3d/sm30/BurnWipe.pso b/wadsrc/static/shaders/d3d/sm30/BurnWipe.pso index 0626821f7af6148b52f2b7a71675461cde675000..50e942ab307466138b4da300e1ecd0c1d9608e59 100644 GIT binary patch delta 20 bcmZ3(w1#QIMlN$bOH(5~V*?|jiMtB{LRto2 delta 20 bcmZ3(w1#QIMlLfwOH(5~BMTFgiMtB{LWl-w diff --git a/wadsrc/static/shaders/d3d/sm30/GammaCorrection.pso b/wadsrc/static/shaders/d3d/sm30/GammaCorrection.pso index f1a4dba105049fee24b01591bef45a357f1776fe..662f59f373e40bebf1e931b92239cf2ad4994756 100644 GIT binary patch delta 20 ccmX@Xbb@KZS}t=vOH(5~V*?|jiQ6Xv07hO0uK)l5 delta 20 ccmX@Xbb@KZS}rp^OH(5~BMTFgiQ6Xv07i@kxc~qF diff --git a/wadsrc/static/shaders/d3d/sm30/InGameColormap.pso b/wadsrc/static/shaders/d3d/sm30/InGameColormap.pso index 4f0bb474c4387a376dbbc3a78bbff594a30d31d5..82f702f8416995c7aa5e193335c5b33ce269cd11 100644 GIT binary patch delta 65 zcmZo*`ocJ&QOR7-($q-L*ucn$L7stuiIst&fq{W}0*K88WHU1GPh4y(0u*Lu;NS;J OJpl?mnehKV0|Nk@#0``H delta 77 zcmeyu*uXTQQOQit($q-L$il>gL7stuiIst&fq{W}0*K88WHU0bPh4!PzzF0raBu*n Y{x<-XFf(wl1KCf2(oZJ*|Ifex05E9}tN;K2 diff --git a/wadsrc/static/shaders/d3d/sm30/InGameColormapDesat.pso b/wadsrc/static/shaders/d3d/sm30/InGameColormapDesat.pso index 593d69f5b3f7fbcd95c671e363c01973fcbc5f7a..44d67d57bc9c62a1ead29815c1500e771f48ae8d 100644 GIT binary patch delta 261 zcmX|4y$%6E7@S>)i-KOXO2UbV(od%)(Ow}T5fVR%&U%BrPUrf2057x;pror;wfP*KIcM6PVvQ%Wh|kYQK`hGQ};0fIu>9CZ<&xw1@qu-RneA^6YNMd2P)A&LVVaNX?%`n-W}F n%ypI88ihp~0D(f8cL-92j}Z^K=ZuE8nq9JoFz;o~S?_@#t++Ek delta 252 zcmYjKI}XAy6m!y20!w$q&VnjY6$B%n1&NW7kt47nM7Tk7gGwBWH3wj1;^CKxCs~di zKfjNC+dVRouS~H$t~X-$v=?o-ns0~UF#1<}gz4YIwhBt`bCGFC?K;#Y&I@RKH@DemD Xs#|vadC^;Xmc6OdX)X@5s1*Tz2XQim diff --git a/wadsrc/static/shaders/d3d/sm30/InGameColormapInv.pso b/wadsrc/static/shaders/d3d/sm30/InGameColormapInv.pso index 35fba3f93c909d296771bc388d66ef18525c91db..78d4abc9d73b945904dfcce04fc46b99b66eae1b 100644 GIT binary patch delta 97 zcmdnPw1H{DS|xKmOH(5~V*?{226+YsCRPT91_lP^2_QBXkj==zKk>Y-2_pkLQ20qB q8^iwvEDQ`l#152t(!j*^w!k;jGvPq-_{c@>_0E#c6k zaPsfFPOGH;ER#AfKG1cY;w=S_*v0KSS*2`vIHo3N7f)%v%IXT6YB^dCahJc8MOD1j z;rabVcr#zj!$p?7re!!Q)|>pD#UzR^qscgqM#DJ98J}_hd79fweZ*Q}u&-6)>}zgo z5e)RS|IUDZLvFM~u5c)P>%;1x=K*J!#)r|I-S>qnJZcZ{#IIlpXwgMOuNm&Mt;5-J NkNadUeWtY*_yaU=OE>@k delta 268 zcmYLCF$%&!5S+WjcvzTPvA2s%tZFwD;E zF#CvXv_~ZJkr}qfO*sK@C4#3(L8AgLq#Y3v3K|D;m=mFq&>Q1i-=?WzL?I^Hsh`(^b diff --git a/wadsrc/static/shaders/d3d/sm30/InGameColormapPal.pso b/wadsrc/static/shaders/d3d/sm30/InGameColormapPal.pso index 8facb7f129dd5a39dbd410d2d4d70960f7635215..8de88be2a502c736ae1e427608c8addb435a166d 100644 GIT binary patch delta 65 zcmeBSZeX5pSIJz@($q-L*ucn$L7stuiIst&fq{W}0*K88WHU1GPyC-N0u*Lu;NS;J OJpl?mnehKV0|Nl1^bQvQ delta 77 zcmZo*?qQyASIJDz($q-L$il>gL7stuiIst&fq{W}0*K88WHU0bPyC;&zzF0raBu*n Y{x<-XFf(wl1KCf2(oZJ*|Ifex06xDEF8}}l diff --git a/wadsrc/static/shaders/d3d/sm30/InGameColormapPalDesat.pso b/wadsrc/static/shaders/d3d/sm30/InGameColormapPalDesat.pso index 8a887b064f76ac934ffe8c7cd029c075eb66be8e..ad57fb5768cad4b1a8a50ac90a3dc6f53c259a08 100644 GIT binary patch literal 500 zcmZut!AiqG5Ph4(SgM%22AnvMfvZyVY zD{})}6@oFSL#|=`r-pr5)1ZdGEj6i$GUsf@2aGe$9jhJ!yTo!2?{k5^QV(DJe}pAc98^>D@z)LVm!b zH-9AG;X1nw>cLGOZ{Fw-(B|h0erGR&SFzDo`4Uwm}RmA3}ozTJ+n+Q z0ybVW1H7^ud<0r}Yq)pK+2r?W$WlPAdz^WeUNyCK$$R8$&=2$h z_2cqaGtLDy%%;aSrwcl7LNY@?_062{yKY)|4jh(?7^3%u>h?xbzd; zyEH35!tva+78l;(GUuLq?qdeFG2iAAz1#EdA%HJB$nEfw7%SkDS4Ov>cwFSfVw!H# z6*Diq#a`+5M)xKJ?VWB_)%9)dN5#2R9&EXbFbUG~MJk8vMHlWCe@k&N1-76#G7GEU;h)H}X8@hU8~|6XO@|ZQgfFoFR^01^c1~?{k5^QV(DJg9}U<)2StalGN3jG0( z-u#jLgcsM@Bc0Wh1X4H^C%{0H~rIQ`^0bh zXRQ|YIr0V|c^hSLomikzVIi#wvzvn3$c)BdK}^7B5z>Lq1oU%`)b4X$^b>(Pvt2 diff --git a/wadsrc/static/shaders/d3d/sm30/NormalColor.pso b/wadsrc/static/shaders/d3d/sm30/NormalColor.pso index b0e385fb77008c90344faf0486381faf93aa6f2e..ef03e98856ecb10bdc152301b8b73894c928403b 100644 GIT binary patch delta 20 bcmeys_ diff --git a/wadsrc/static/shaders/d3d/sm30/NormalColorPal.pso b/wadsrc/static/shaders/d3d/sm30/NormalColorPal.pso index d813d66146e2d42173593ea21b2c1e0a10ca4373..5b9e9bc8a955e819e25dcdb28053b11075b103b8 100644 GIT binary patch delta 20 ccmeyv^oMD}T`qGyOH(5~V*?|jiO;7308vT@djJ3c delta 20 ccmeyv^oMD}T`n^{OH(5~BMTFgiO;7308w}cg#Z8m diff --git a/wadsrc/static/shaders/d3d/sm30/NormalColorPalInv.pso b/wadsrc/static/shaders/d3d/sm30/NormalColorPalInv.pso index 8ad0334958bf2e3fc34c479eeeafe912de36c721..6db89496438dff4cd1e44aa8ba19b0359ced4cdd 100644 GIT binary patch delta 21 ccmZ3%yn=bcPcCykOH(5~V*?|j$;^yP0ZL>BAOHXW delta 21 ccmZ3%yn=bcPcAb(OH(5~BMTFg$;^yP0ZN<(DgXcg diff --git a/wadsrc/static/shaders/d3d/sm30/RedToAlpha.pso b/wadsrc/static/shaders/d3d/sm30/RedToAlpha.pso index 749ad1aba9d383ae9d8ea0fbb7f8a4bcfe4b6bfb..e8bff75b3f0d490803302bf13dbc21e795288c2c 100644 GIT binary patch delta 20 bcmeys_ diff --git a/wadsrc/static/shaders/d3d/sm30/SpecialColormap.pso b/wadsrc/static/shaders/d3d/sm30/SpecialColormap.pso index c1f4d8f356f86772fec6de2ddf6029ea62c5af6e..5da15158e987f2bda6a5c9701170bdeb38c2fd9b 100644 GIT binary patch delta 20 ccmaFB^nhu?S}t=vOH(5~V*?|jiQ88K07?c1_W%F@ delta 20 ccmaFB^nhu?S}rp^OH(5~BMTFgiQ88K07^6m0RR91 diff --git a/wadsrc/static/shaders/d3d/sm30/SpecialColormapPal.pso b/wadsrc/static/shaders/d3d/sm30/SpecialColormapPal.pso index 4ee1be80c6ec841aebb41a7edb85fb4dbe5d50ec..baa84e7971ef98cd01a49ca1d10f39c7e4f39724 100644 GIT binary patch delta 21 ccmcb^e200$PcCykOH(5~V*?|j$;^y50aCaIyZ`_I delta 21 ccmcb^e200$PcAb(OH(5~BMTFg$;^y50aEY=#sB~S diff --git a/wadsrc/static/shaders/d3d/sm30/VertexColor.pso b/wadsrc/static/shaders/d3d/sm30/VertexColor.pso index 46e56db6bc6d0029d4431d67cdba3e8894f1312a..46d2bc3d45b3dadbc0f56c7d40a921eebc9dd584 100644 GIT binary patch delta 18 Zcmb=anGnilu4id#q-ShkWHd2e763C01n&R< delta 18 Zcmb=anGnilre|qtq-SJdVlpva763Ck1o;2}