From 7dc76d6501b1ef8e342b71ec4212d31fd0955036 Mon Sep 17 00:00:00 2001
From: Jezze <jezze@gmx.net>
Date: Sat, 13 Aug 2016 20:30:40 +0200
Subject: [PATCH] - already fixed scanline issue also applied for swapped
 orientation (nw)

---
 bgfx/shaders/dx11/chains/hlsl/fs_post.bin     | Bin 3550 -> 3630 bytes
 bgfx/shaders/dx9/chains/hlsl/fs_post.bin      | Bin 3123 -> 3139 bytes
 bgfx/shaders/gles/chains/hlsl/fs_post.bin     | Bin 5017 -> 5366 bytes
 bgfx/shaders/glsl/chains/hlsl/fs_post.bin     | Bin 4769 -> 5106 bytes
 bgfx/shaders/metal/chains/hlsl/fs_post.bin    | Bin 5468 -> 5833 bytes
 hlsl/bloom.fx                                 |  11 ++++-------
 hlsl/post.fx                                  |  10 +++++++---
 .../bgfx/shaders/chains/hlsl/fs_post.sc       |  10 +++++++---
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/bgfx/shaders/dx11/chains/hlsl/fs_post.bin b/bgfx/shaders/dx11/chains/hlsl/fs_post.bin
index 927c16d8057779de7c333808351e27d1242fc302..b22fb024fb8a4e8f7fde1df74a571354d02f570b 100644
GIT binary patch
delta 250
zcmca7y-sF>1e1&ak4uD;^P9MoAB(~S`g-p!yzp7RDVdRhfkA+0vI)~ZP7`hh1_vPb
z?Bw4}#f&VQ^O>#L>J1qfIFuL!7?^+(j38Mc;A&6+(@=u*5LBM61tJbI6PYawGy|q)
z86U(fm^{c_J_ZJEBcK_~KsJ*DkYHf2hhm`hK;Q<o5bOvB26ha?SRk6s85lSx=W$6e
LT5VS5+RY3AOpYM~

delta 194
zcmZ1{b5DAM1e44GZkGrr=Q;il&3NX|?Y(4n-&ajFd^aNl1H%FC$tFzuIG=DaFgO6Y
zJ175UDrRKfoX>2{RuANJDlrH!Faa4-4GKV#fdQlknJvq}zyVi-rWT}+4=C>h6=!q+
b3NSF(!}NpXf#$Kp^lQQNL+H(wTw9p|p)?y=

diff --git a/bgfx/shaders/dx9/chains/hlsl/fs_post.bin b/bgfx/shaders/dx9/chains/hlsl/fs_post.bin
index df24551cb4e03e81b96c3cc68886938f2a17b4f5..8cc13a336da4d94fa6f2be0f02aa207536bc6f98 100644
GIT binary patch
delta 1187
zcmY*YOODe(5Up-Iu}Q)V^8q`v0>Ma(U;!KfEN)=I4G^brdC6`hU!b$KgoHHA3D~fM
zD<FA?G*>Y1bvcYjN|dhGRqws3>RgpS%5SB2&#$)rOZxe#h!=6X5eY7yH(JOLK8mCW
zRYZ0oeJe7yGYoN!ygr~fagyN7`r(os9&rK=5Tv{VuD<(~6~!{%Iz?5mv&Xsao@Cp`
zvN!rbs*p&9s!EA@G0YowNf!<noV6azWGBWv!z!p(5wpBH<~aEtu>_9j{s0aS<WE?j
z1Ju5Pks%h+SRypptDR|bR3?&;f)MCl=O>L(Ik^G)H)bFS^n)IP{w;z;4rA={A@~?)
zs2(t|amV%&$@IQRAci3;Yf{uuMNmUk=I}nnm#t1UyR-qoi(`O`DTySf5PuvC9Zl&8
z1T6N5YsB>wr-*yReYn5~k-NjTS(D%sM^YfyO<RSjcy^NOnT+AnerdLx5e3!Go(b1}
zgO1o~9}IJdDNyqlxfF>Qa_dPnJ_yb|n2C7beZ5ySyb*o$|Hgx*))FyY?3qf~C4Lv{
zLkYVW11L;!e!m6B7Io*bP4bH7lRJ+03~l>&w{}}BFRT$eNs&D2YG%q|ez=>NvUZu%
zy;;5dV9H)I00Jd^@sK$S>xkrwTQNGB#YVPwPqAs9-Sz6C;mZJ@()9}*xHxwF@D7LQ
z5#sqYOy4HMUCi(HTI9t;!~X2QATur7Z+09LD9**RiL`6h=iSfsv!f-J{5ww0l9%1}
S`u%Cne}}Yu*?cGCi0B`lLel2|

delta 1219
zcmY*Yv5wO~6r5c<mykFYj&Q`G00g>%-++jg%7T(V@kXMd;w19{>(&+0eF8r~aeM%h
zo0Cq|*M*sVHslIRJ8$2-nfLbjM|o9#FTE?Tw*E_AJHP`)*r1OKAaig5ID|P6C&VCT
zPT*bq2;@xXJzAjKGjIPY@$*pJyVqUCnqA^JWaL!glp3e_9Z$&dtV`iKfy_jPv!`G+
zBzY!PLy>|-y1mCPWc=tP_n3r-xQ-sz<Xm6Mut(xhyo$mScj)>32@=jtYdF76Vsera
zH$Y_aB|G*L5;HoM&{$-`LOEk&z6x)e_tVW<vvHiGS^O-?rk$Rz%tArdF2&qzU7w_B
zINULE8*Ivo^<jmd@eRFXSP|a@H#04dCB1xOQ-{_XUxp>UdUEtyBS(HfjtyeTzWT(I
zJJlek&1x3X#UloDOnJUbMIN)U7ZjhsX}V!e0mGiSBCZCU6L-X2oH3uX3L4DQVKBmc
z?mf*$nbisbP%N$0uygjznzX}=<S{u<iH=?I>08@5#X8}%Q$C4WjH^O%Ga&&!ar}?F
zp_c921G}r~IA<}0C;yVISV?S-QwO1B#}d9D>tac>oDNG^-tqmGHMZnk@KU=dQ==g@
z;L&`VKl?C-KpPz5AnU@EXT|t&)zz2NSuY=tIVx+i`ajjDI92m&{<;PqRalQ=^PBRF
zR#;o6nd|>Mht0|%PvbZvR$IcVDgE)RIUnDd_AKRbky>q`{CP}YQsj_?MsZ8%S+Gw@
oS@U&qaaNGLOIu=jMRT)w*DQ+dbFpF8XZjJa=Z~14{%|1r3x!SHRR910

diff --git a/bgfx/shaders/gles/chains/hlsl/fs_post.bin b/bgfx/shaders/gles/chains/hlsl/fs_post.bin
index f7039993aaca88f8628c493f3cd0235e7481d3b7..a48adbecf4f0b9d4df6949dd56c587451f55e4aa 100644
GIT binary patch
delta 334
zcmbQK{!Md(1QXLuq0LfE%Dj`8a0#+1RC6gPO!gH}o@~M|98jTPW2>N18eg1WT9lj`
zpOTqdtXH9+rC_9IpsA?|R;vI7CAkG<iAC{-W(q(Z270Cn`U<7-g{6rpP+gkVAcOrl
z#AOu}kkuOK8GvLUpw@cwLVi(Bxcuaa{F0M{1w>fQ!MY9j9k>y?%_mp#D@+dJ5Joc5
z9B4Z}6U`^@<X<Ob0kaWik;UXnfg`*YK%c=yHhT%4V-&E2sDz1HPJS&QHQ7m6n$dD{
RoUlF*Si07ltCow40RZ!dS{eWV

delta 148
zcmeySIa7Uu1QSz@;ASZ%W!}kI0>+cia&s`6PF^9PFj<3BLeS7u!B)XQ&%l~X0Ssy<
zf8-ONY$n(@IhUW4vn02mEU_rw&}{NG!6SlZ3R((q5ltNhjmaN{gg5UK+Ri9o4$%*j
eHJ^MzSZeZo5ot#A$-71LdBD=O)?Bq*TnqqHn<@|h

diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_post.bin b/bgfx/shaders/glsl/chains/hlsl/fs_post.bin
index 49f23896de73cf424887ab35a325b9a5177b184c..2bfa4c7145fe06a98ecd82e9a07f7a76595a6a86 100644
GIT binary patch
delta 398
zcmZ3e`bm9*1QXL$!Oc=kW;|lW<%tFH6_t7w3U&$xdIp-B3e{W+3X>D~Ws?;YGSd_^
zG)m(OOA}M#Q!;alfvRk56@Vhe`K3k4sW34u1tXA7h*kwCD9J4-ODu{vG*bZTFwiqq
z&{se)Nz)o+PXULxwSoe&TA(99G7wOUV8Yax0?mW5%_c8kmz<o&&&O&GHqDvOfg53(
z`Q#oxg~=rx!bmol19g*PgZbn$d@F=3V9tP9Y%#fw|A?T4f)?B<7MeN=8j}|a2yf04
h*u*Gc3DE&lZ#mgO$du7?a+;7n4_FH5v05%J1^`TxYoP!D

delta 133
zcmeyQzEE|81QSz>z-B2XGoHykd|Z>O`86l|bFxq77hs*diC=c|3U&z)o7q6mV6v>h
z3L!IVE(I_s$t@^LEQ&WYn|xj12(OufmI7R4^9sR}i~{Bml`v8B$&JFMjOLTK3+wZM
MrE0CYYPq-=0MuC|$N&HU

diff --git a/bgfx/shaders/metal/chains/hlsl/fs_post.bin b/bgfx/shaders/metal/chains/hlsl/fs_post.bin
index ad8382250a90fea8fd6045f307658949879ef60b..ab0fc156fd599c88072de54e1dd92c1a0912c1c7 100644
GIT binary patch
delta 422
zcmcbkbyAndE!cyFvH8<O28LZ?8+kJM#fr-l3*sv(^(qwX6b$qXG&L2fxfB#8FBFiS
zoXRi7STVVQUrM1uK}*31BngpKfP#|Tg0jS-cteZHJNRYUDm1M@I^{XUtrZmDQVO;p
zV?i<yP>W!~)R+U+z}Oa(4cR3pFBjlrwFH}%$nVFEFwGKZk@{q14q+r4EJ?J%a`J!v
zt-?ldCqZpCGMIc^plR|ZVX?{af@W$)FlSc88yNv@(10rg1_hiw`6IW?<m-Y}j7F1#
zgbJ993@0BEdM{)Q(+g8)Jo%{b2}a||eIl{~CJ;%Ol*#1XBEF0!lQ~7rfTV+{3;@d5
BbK(F1

delta 207
zcmX@9dq<1ME!cyFvH8<O1_oczjXatBleq-BC+`)|pZt!CgVB8QUw&D}%E<=oiX4XK
z3bqOcdIpno1h-C}$Ir!Cl3P%gSQKw)G1)|@N!ZZRno9u;VB(gOPYPM88Nh@q;*AV|
zCTPH<EflmA;OxmCxn(B12v;#0Ox`bCz+`AS*-+&D<n2PDlTAgBG8#_)Eh;Nu1ThJ!
W$H-{1hL|s-(d05QGa$KEOa=h`Up-F%

diff --git a/hlsl/bloom.fx b/hlsl/bloom.fx
index db23995d55b..42c65e6a45b 100644
--- a/hlsl/bloom.fx
+++ b/hlsl/bloom.fx
@@ -273,14 +273,11 @@ VS_OUTPUT vs_main(VS_INPUT Input)
 
 	Output.Color = Input.Color;
 
-	float2 TexCoord = Input.TexCoord;
-	TexCoord += 0.5f / TargetDims; // half texel offset correction (DX9)
+	Output.TexCoord = Input.TexCoord;
+	Output.TexCoord += 0.5f / TargetDims; // half texel offset correction (DX9)
 
-	Output.TexCoord = TexCoord.xy;
-
-	TexCoord += 0.5f / SourceDims;
-
-	Output.BloomCoord = TexCoord.xy;
+	Output.BloomCoord = Output.TexCoord;
+	Output.BloomCoord += 0.5f / SourceDims;
 
 	return Output;
 }
diff --git a/hlsl/post.fx b/hlsl/post.fx
index 6d8077e2037..717c919d8a7 100644
--- a/hlsl/post.fx
+++ b/hlsl/post.fx
@@ -253,9 +253,13 @@ float4 ps_main(PS_INPUT Input) : COLOR
 			float ColorBrightness = 0.299f * BaseColor.r + 0.587f * BaseColor.g + 0.114 * BaseColor.b;
 
 			float ScanlineCoord = SourceCoord.y;
-			ScanlineCoord += QuadDims.y <= SourceDims.y * 2.0f
-				? 0.5f / QuadDims.y // uncenter scanlines if the quad is less than twice the size of the source
-				: 0.0f;
+			ScanlineCoord += SwapXY
+				? QuadDims.x <= SourceDims.x * 2.0f
+					? 0.5f / QuadDims.x // uncenter scanlines if the quad is less than twice the size of the source
+					: 0.0f
+				: QuadDims.y <= SourceDims.y * 2.0f
+					? 0.5f / QuadDims.y // uncenter scanlines if the quad is less than twice the size of the source
+					: 0.0f;
 
 			ScanlineCoord *= SourceDims.y * ScanlineScale * PI;
 
diff --git a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_post.sc b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_post.sc
index a0d6f56772a..63800bb61d3 100644
--- a/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_post.sc
+++ b/src/osd/modules/render/bgfx/shaders/chains/hlsl/fs_post.sc
@@ -149,9 +149,13 @@ void main()
 			float ColorBrightness = 0.299 * BaseColor.r + 0.587 * BaseColor.g + 0.114 * BaseColor.b;
 
 			float ScanCoord = BaseCoord.y;
-			ScanCoord += u_quad_dims.y <= u_source_dims.y * 2.0f
-				? 0.5f / u_quad_dims.y // uncenter scanlines if the quad is less than twice the size of the source
-				: 0.0f;
+			ScanCoord += u_swap_xy.x > 0.0
+				? u_quad_dims.x <= u_source_dims.x * 2.0
+					? 0.5 / u_quad_dims.x // uncenter scanlines if the quad is less than twice the size of the source
+					: 0.0
+				: u_quad_dims.y <= u_source_dims.y * 2.0
+					? 0.5 / u_quad_dims.y // uncenter scanlines if the quad is less than twice the size of the source
+					: 0.0;
 
 			ScanCoord *= u_source_dims.y * u_scanline_scale.x * 3.1415927; // PI