From 43445e5409351a38b2780255a52cf6e6575c33fc Mon Sep 17 00:00:00 2001
From: Xottab-DUTY <xottab-duty@yandex.ru>
Date: Sun, 4 Feb 2018 20:01:25 +0500
Subject: [PATCH] GLSL shaders fixes MSAA and HBAO is broken And level fog
 is... yellow

---
 res/gamedata/shaders/gl/combine_1.ps          | Bin 6563 -> 6579 bytes
 res/gamedata/shaders/gl/combine_2_naa.ps      | Bin 2502 -> 2499 bytes
 res/gamedata/shaders/gl/combine_volumetric.ps | Bin 817 -> 821 bytes
 res/gamedata/shaders/gl/common_functions.h    |  10 +++++-----
 res/gamedata/shaders/gl/copy.ps               | Bin 593 -> 587 bytes
 res/gamedata/shaders/gl/copy_p.ps             | Bin 666 -> 690 bytes
 res/gamedata/shaders/gl/dof.h                 |   4 ++--
 res/gamedata/shaders/gl/rain_apply_gloss.ps   | Bin 1060 -> 1071 bytes
 res/gamedata/shaders/gl/rain_apply_normal.ps  | Bin 806 -> 833 bytes
 res/gamedata/shaders/gl/ssao.ps               | Bin 5772 -> 5773 bytes
 res/gamedata/shaders/gl/ssao_blur.ps          | Bin 1434 -> 1431 bytes
 res/gamedata/shaders/gl/ssao_calc.ps          | Bin 1833 -> 1825 bytes
 res/gamedata/shaders/gl/ssao_hbao.ps          | Bin 15024 -> 15183 bytes
 res/gamedata/shaders/gl/ssao_hdao.ps          | Bin 12922 -> 12868 bytes
 res/gamedata/shaders/gl/ssao_hdao_new.ps      | Bin 21780 -> 21699 bytes
 15 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/gamedata/shaders/gl/combine_1.ps b/res/gamedata/shaders/gl/combine_1.ps
index 51e16a192d38dba8d49d35e07468a04e1fe005e9..719bb815e48e203738b716efdcc2687a48541edc 100644
GIT binary patch
delta 73
zcmZ2%yxDkzGn-syUWt*0r(QvRu~CX%MWv>W0#HQ5GuY8Lz{gc{awMBOD_F_o1#Bw(
MXtJ9xuw51c09l3>>;M1&

delta 51
zcmdmNyx4eyGn<&FUO|4bQHowgrH+Duj)G^fqi=wZ>*Pc>_sI^ND$GE^$sajIHos;&
GAp`)OxexpR

diff --git a/res/gamedata/shaders/gl/combine_2_naa.ps b/res/gamedata/shaders/gl/combine_2_naa.ps
index b416aa4d2ae63a4124d484807d13eb793956a6de..931c58262ba3d5d1e64f056eb1c0939648642090 100644
GIT binary patch
delta 12
UcmX>md{}tHBbLoiSst<g04Es*#{d8T

delta 14
WcmX>sd`x)5BNj%3%@0@}vj6}twgvS7

diff --git a/res/gamedata/shaders/gl/combine_volumetric.ps b/res/gamedata/shaders/gl/combine_volumetric.ps
index a5dc80eadbcf252173bd6179d694b5d26a878b5a..fea66db16b69f9ee7b35fd73edd0a4bd8c7eec63 100644
GIT binary patch
delta 36
scmdnUwv}yzHq&H1rZj=HoczQRBMnczl4Ju-1ucci+)VP5_b`<L0LwWFj{pDw

delta 27
jcmdnWwvlavHq&Gcrp(Fn8Ce;%CNE@?XEd0+kEt90b=3$d

diff --git a/res/gamedata/shaders/gl/common_functions.h b/res/gamedata/shaders/gl/common_functions.h
index 42c88272b9e..95d4e313eee 100644
--- a/res/gamedata/shaders/gl/common_functions.h
+++ b/res/gamedata/shaders/gl/common_functions.h
@@ -239,7 +239,7 @@ gbuffer_data gbuffer_load_data( float2 tc, float4 pos2d, uint iSample )
 #ifndef USE_MSAA
 	float4 P	= tex2D( s_position, tc );
 #else
-	float4 P	= texelFetch( s_position, int2( pos2d ), 0, iSample );
+	float4 P	= texelFetch( s_position, int2( pos2d ), int(iSample) );
 #endif
 
 	// 3d view space pos reconstruction math
@@ -264,7 +264,7 @@ gbuffer_data gbuffer_load_data( float2 tc, float4 pos2d, uint iSample )
 #ifndef USE_MSAA
    float4	C	= tex2D( s_diffuse, tc );
 #else
-   float4	C	= texelFetch( s_diffuse, int2( pos2d ), 0, iSample );
+   float4	C	= texelFetch( s_diffuse, int2( pos2d ), int(iSample) );
 #endif
 
 	gbd.C		= C.xyz;
@@ -300,7 +300,7 @@ gbuffer_data gbuffer_load_data( float2 tc, uint iSample )
 #ifndef USE_MSAA
 	float4 P	= tex2D( s_position, tc );
 #else
-   float4 P		= texelFetch( s_position, int2( tc * pos_decompression_params2.xy ), 0, iSample );
+   float4 P		= texelFetch( s_position, int2( tc * pos_decompression_params2.xy ), int(iSample) );
 #endif
 
 	gbd.P		= P.xyz;
@@ -309,7 +309,7 @@ gbuffer_data gbuffer_load_data( float2 tc, uint iSample )
 #ifndef USE_MSAA
 	float4 N	= tex2D( s_normal, tc );
 #else
-	float4 N	= texelFetch( s_normal, int2( tc * pos_decompression_params2.xy ), 0, iSample );
+	float4 N	= texelFetch( s_normal, int2( tc * pos_decompression_params2.xy ), int(iSample) );
 #endif
 
 	gbd.N		= N.xyz;
@@ -318,7 +318,7 @@ gbuffer_data gbuffer_load_data( float2 tc, uint iSample )
 #ifndef USE_MSAA
 	float4	C	= tex2D( s_diffuse, tc );
 #else
-	float4	C	= texelFetch( s_diffuse, int2( tc * pos_decompression_params2.xy ), 0, iSample );
+	float4	C	= texelFetch( s_diffuse, int2( tc * pos_decompression_params2.xy ), int(iSample) );
 #endif
 
 
diff --git a/res/gamedata/shaders/gl/copy.ps b/res/gamedata/shaders/gl/copy.ps
index 85ba929bd2fa705cc5b37845b9a6875238199e66..e16a8c3341d8a3da70e68312c33ee114c343c73b 100644
GIT binary patch
delta 15
Xcmcb}a++ns8OF)y851TOG06h}HNpkU

delta 19
ZcmX@ja*<`j8Ae8f$)^~TfTR|aA^=FC1|$Fg

diff --git a/res/gamedata/shaders/gl/copy_p.ps b/res/gamedata/shaders/gl/copy_p.ps
index 23ec3ddf201f146ac003ad376e80e23dcac5a898..a9407a0dee908844f8ae55a197cc448315db55d6 100644
GIT binary patch
delta 70
zcmbQmx`}neG)5H#AV|x}Pb@J}D332mR<KnlNw((V1hMrhDi!o?fx?p)FnTcosaK2|
NlSP>vV9W+4DF6YB72E&-

delta 66
zcmdnQI*WC~G)6AYl4QM#N(Fseg~_`Zy(SkhX)qd0)?so2v1AQ&6g-0+eFJ=46*R56
NlvDFkGSgsGEdY7v5{>`>

diff --git a/res/gamedata/shaders/gl/dof.h b/res/gamedata/shaders/gl/dof.h
index 66991c203cc..11b8ef52582 100644
--- a/res/gamedata/shaders/gl/dof.h
+++ b/res/gamedata/shaders/gl/dof.h
@@ -39,7 +39,7 @@ float3	dof(float2 center)
 #ifndef USE_MSAA
 	float 	depth		= tex2D(s_position,center).z;
 #else
-	float 	depth		= texelFetch(s_position, int2( center * pos_decompression_params2.xy ), 0, 0).z;
+	float 	depth		= texelFetch(s_position, int2( center * pos_decompression_params2.xy ), 0).z;
 #endif
 	if (depth <= EPSDEPTHDOF)	depth = dof_params.w;
 	float	blur 		= DOFFactor(depth);
@@ -79,7 +79,7 @@ float3	dof(float2 center)
 #ifndef USE_MSAA
 		float 	tap_depth 	= tex2D	(s_position,tap).z;
 #else
-		float 	tap_depth 	= texelFetch(s_position, int2( tap* pos_decompression_params2.xy ), 0, 0).z;
+		float 	tap_depth 	= texelFetch(s_position, int2( tap* pos_decompression_params2.xy ), 0).z;
 #endif
 		if (tap_depth <= EPSDEPTHDOF)	tap_depth = dof_params.w;
 		float 	tap_contrib	= DOFFactor(tap_depth);
diff --git a/res/gamedata/shaders/gl/rain_apply_gloss.ps b/res/gamedata/shaders/gl/rain_apply_gloss.ps
index 56da21af9b13c43ca1ef55d2b8a2dae0e0aa6ef8..f11f5c8055b43bddd544fd6fd217875df240bbc2 100644
GIT binary patch
delta 54
zcmZ3&v7TeYcShFCyb>dg$+1j|jGB|BnVb-OeoY+(prl4-aAIyjPO9eSE~Z(G0K~fx
AX8-^I

delta 41
tcmZ3_v4ms8cgD$o7!{dy6bvTIF*$+QJV3UNLS}GcZb44!=BZ4x7y%+^4Q2oU

diff --git a/res/gamedata/shaders/gl/rain_apply_normal.ps b/res/gamedata/shaders/gl/rain_apply_normal.ps
index df1ae290c817b76b065ba1d5abe1740404981774..54beae0ff901b83d3884eef4aa75cefee86c8e45 100644
GIT binary patch
delta 140
zcmZ3+c93nuCq}KboczQRV~vv3iqssp)RN>34Ta+Pf<z!AH6=bTzbH2`M@Jzuuf#}W
vvH+7JkEV`-XRxDhfRC$!=43l2F%tC)0`&t8)5r`?%q_@C)dU){fT;}t940O}

delta 77
zcmX@ewv27VC&tM?8RaI+FexhQC>ZD{cm_NA2KcxtXj*eAr{)x=a&e~R<R_LGE5!RL
Y*ebx(@`BZ71}Ekg<fJN0-p$ko0D1%#od5s;

diff --git a/res/gamedata/shaders/gl/ssao.ps b/res/gamedata/shaders/gl/ssao.ps
index 59a7ec310af88f299b3b921c88b686130600057e..4daebc34638b10c847951d68957a8eea38bbac5a 100644
GIT binary patch
delta 24
gcmeCt?bY32&N}%qllW$T*2O$bdR3c03C>~x0Bt}BqW}N^

delta 19
acmeCx?a|#}&dR8>*_?G3&*sm9vseH?d<K^Q

diff --git a/res/gamedata/shaders/gl/ssao_blur.ps b/res/gamedata/shaders/gl/ssao_blur.ps
index 470293d2b255f9a05f89c494d8a68d4e66169337..e20c977d9024164df1d73660730f168938e83d76 100644
GIT binary patch
delta 12
UcmbQmJ)L{Q6UNQY88<Tn03uHXE&u=k

delta 14
WcmbQvJ&Sw86GldZ&5szjG6Mi98U<Vc

diff --git a/res/gamedata/shaders/gl/ssao_calc.ps b/res/gamedata/shaders/gl/ssao_calc.ps
index bde54946d19ecdc86e6f37f36fe918915f1f6b3f..c9f0bf1f67eccf1d681bde8e0ef0e332c99f3acb 100644
GIT binary patch
delta 21
ccmZ3<w~%i_I9Et&MM-H<s*#Jr#>@k3093mNzW@LL

delta 29
kcmZ3;w~}u{xKL?cW?FtxE@wz;MM-H<s*wxl#>4|`0HG-gu>b%7

diff --git a/res/gamedata/shaders/gl/ssao_hbao.ps b/res/gamedata/shaders/gl/ssao_hbao.ps
index b0a2cf763ff584335553338feb2d7551790e1d78..f3215e3f4db39d032b1828f0dd4e8fa288a4074d 100644
GIT binary patch
delta 871
zcmah{L2DC16lM}*NtA+H8(Y$bXD!*8B;C!<#Kxq?-ZUPB(7gy%m$h}%NK7<YOH{;*
ziWa2efS_2=b5Ybii&w#eH!l_Z10s6$<jn4t1`#@knc>a*zW2@d-rMV6Rv%y3=d?Pu
zTf~M|An)wYk%+GId~|GbsnhPc;6K6{t9}})z%-+194*sXhyRYA^`1vZ_C~au-s||c
zA%XH99{9co8GI!PVt<hQ=<f#aA6iF-H#7!OM7f%pJVphTYqx6@bm(2{y0WwbxgeJH
zU&ve{0b&K^?T&;L`0eQuf0J567B5Yx3n5M8QrpG#JeXuIo`~!E;>E7rURpWt<0VJa
z0gRWaMd3I!EK$%}Adtxb7L`m2CxW_!z%Bk#ImkauETsRV%%oD8Nrf_wV00L|vc4~0
zaPztXKp|HJ$8NPcj)S|DKo)SX**0MY#8IRCk#a5`sx~SAr6du3lE%W7jr|s18&SMx
z>1qry{`JV^I15c;Jf)70*O>1M`_~udtxmr{5sPspb5|grX6|9OZR<{B9isKc3OqJ_
zE|c+!dRQVC)lJP}JLUwb^MUvNTx`QDVT@nFz)#{~m4)sxfL-#Zgt&D)b%y}~@d?=%
zxn#5DPqARO8-gv=To4lxYMz%#CWA_tJb;$2?uzz1Q1Ls!fTu|cF|SPCqrti7KeHRq
z6mxX7)1%8;KQqfnejso|2E5JORumPz`}!Y*iu_gCjOn`Fk+)Irhmni<!K61+awGor
Klh~V;Q-1+!O8h+l

delta 625
zcmX?KwxM)F9J8UG!N$zfOybHZscD&csS3XF0iFuRdWI&3rj|x#X_E!G!Z#mg7G~Rg
zgYypi=52!aStd^tQ<%J6Z2#nP@dKMJBovq@M@q{YE7&TOB<6W2=qnT#7L{lKjZIU~
z1`BC{#5JwCxD<dOEhj&*L?JOBsN7)k1r_tjM+KHm?v>%1JXKJTnUjli@;Vs_83h}K
z^mw2#@j;pjYHA7^Km&pm?7)U;ZoVm)%{Vz$PJD6!ThwF&Zq~^wC4@IWm$PA=tfG=-
zhUN^gJ2dqwfB>IsHlI|P!#Fuzt!45XwN_!6ACNRp_7f7HyhL4W@*efo3JB*x47OK5
zQmJ62F!_~+f_hp`V!DEst%3%~*)Z2DC}2^mG?`aZsa`=-0T@Q0AOZn!P=Yjrjj>bE
zFaU-p)F1W`6RjYMkTex%0>dAtCZKFE&~aczNSbOP@iO^<Cg<i;nwuCw31V`)_FM&x
z%)AoKg8X8m6uk;HGh-cOfl8pjW*42?%$pSqelbqAw+d#_*H6p`GDIhz6c*V$$4HzN
T$PwFo%DjXL$T%^X!`dAHVcxs4

diff --git a/res/gamedata/shaders/gl/ssao_hdao.ps b/res/gamedata/shaders/gl/ssao_hdao.ps
index 026bab73b834b9224564b36cdbbdd72ae0ceab65..cc6161843430b68e8d3bd44e899c1c7ce4284eab 100644
GIT binary patch
delta 163
zcmeyBawKKLEAGif0@9N?cmjd6;^cKgJd+*x>?aEe>rS2nrllu8<Ky3)!rR6KQ7DiO
zq?>>W6emjvCIV^c$<qb%poR!d_7e+*8U&I9sgvHkN!XoZauKu8WIh>BFuhlaeRHvl
ZGAo#~TCoUB8!44RCEY>vW=Z8legFxHGl&2H

delta 189
zcmX?-@+)P-D{e-E$%Vqwli7qsCg0$7np`X_IXRyv7%VC~`7Tc&n5DKkh_{Ccs?=R1
z2da!?@<EXlAX|F!Ux9S6tn%cgqS;_sF)^4bk;!w!BEYKd@(4}l6OY(jES$svRxUjG
inY0&#wb@Zdn-wZpt5^(WF)EcqS)EEAP=$|_lK27o(>sg+

diff --git a/res/gamedata/shaders/gl/ssao_hdao_new.ps b/res/gamedata/shaders/gl/ssao_hdao_new.ps
index a769daa556a3cbd547495343c79529d935d0ea78..19b6974694494f01bc004623a4dff7974c68fcd0 100644
GIT binary patch
delta 297
zcmbQTit+GD#tj>lCJQTzO+KaMwpm#D5HpzbPAv~im#UWoX{pJa8V*2OVsnbd48h6D
zwvv<m?D!|ovyz<bU}X&C%S^stCp&q)l{Jv9I{BuZ2$0P&S<f0ICpo#+dIeMu&tzYl
zaHx9D$!Barfb2@B8lK4>wjz`L9n~iPvo(RLPll?E1=1jM6(?uf!p!8Ke8*03@)<|r
z$=;4!o0%N$a|2x{GWmx$$mODw>wG}8$mEj&l9Oe8e}dUMeyL!3h2J5l8i~oX{PUq~
W$;nm$6=3<30Uc0Ua&u$gWM%;8vS;G}

delta 335
zcmX@Sl5xr^#tj>l7!4)|s!L2huH*(`ZB|xZ!whChPJX7A3ug606@628fhr2nm?a2g
zHrhx}R<Plj%x~on=BZC!X(uvyy(P!w`BuhY5xL3ltRkQ)<E>Y~^(2E?)o?YOlV{nA
zOm?tgnS8*8bF#BNM7Q+hcxxV@Odebx&tzS@a4-*KR|s6cET-Pg{q{0EKn09};*$?}
zLwq7W*~(vH@?9VH$%#H7Co={bOupyy1FGt^Zwi!^;&%|p3RDNFZ-=uaCL08DO#bFy
T2v(&(c}hS&qrqmzz(dRc#rADH