From 758aaa496aa546a372fd3f21612395a2dd65826e Mon Sep 17 00:00:00 2001
From: ImJezze <jezze@gmx.net>
Date: Mon, 6 Jun 2016 19:40:10 +0200
Subject: [PATCH] Fixed scanlines if the screen output is less than twice the
 size of the host source

---
 bgfx/shaders/dx11/chains/hlsl/fs_post.bin     | Bin 3394 -> 3550 bytes
 bgfx/shaders/dx9/chains/hlsl/fs_post.bin      | Bin 3015 -> 3135 bytes
 bgfx/shaders/gles/chains/hlsl/fs_post.bin     | Bin 4609 -> 5017 bytes
 bgfx/shaders/glsl/chains/hlsl/fs_post.bin     | Bin 4384 -> 4769 bytes
 bgfx/shaders/metal/chains/hlsl/fs_post.bin    | Bin 5115 -> 5468 bytes
 hlsl/post.fx                                  |  10 ++++++++--
 .../bgfx/shaders/chains/hlsl/fs_post.sc       |   8 +++++++-
 7 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bgfx/shaders/dx11/chains/hlsl/fs_post.bin b/bgfx/shaders/dx11/chains/hlsl/fs_post.bin
index 740cea66bf5d80dd6a66e5f6d485a133ea1c3808..3aa4cd217007e5b562855835945acdeeb9fd2b26 100644
GIT binary patch
delta 278
zcmX>kbx(SO1e5duZkGrrXXB^mA56ZvTE%c;<?jR)i*Jk!3=9V*8#C?ae8R=R-~i<9
z-29tqJzG7H#i_&~z`z7#NHr(`Nd^XxVq~@~0|N(K4VqezK0ctl6I7hh0Vu%0U=Py|
zk_Vc{4%4p%(+{DeK#Jj#Qb0iv0MQ_g7C^_r42Bs9avT@bp==N}DEdMAz?N)&&Kb=N
E0Grq!vH$=8

delta 121
zcmca7eMoA91e3H1w@ZYR^Pc8R^Vi4R&bl8}^UIaZf56DVz@ReOm}x(!2Nwf_1CTdq
t^KYj0Y_=8*3>-=f0t`$*At@jY0#XeMU>c+eT^^*43o6gHxtS}P836jw70Cbq

diff --git a/bgfx/shaders/dx9/chains/hlsl/fs_post.bin b/bgfx/shaders/dx9/chains/hlsl/fs_post.bin
index cc98415c59f1f9b5a17c99715f75a8cc8074284a..4cbc9b2fb7b70fed9e3b4bb38d144709988939a1 100644
GIT binary patch
delta 1329
zcmZ8gJ#Q016r5e3Kk!G)R~*}EA_&yfNQo_E3QCHT_ysil0lHfYBqXXxrlH$Qc@+}0
z2s%Usg{e{@xrv0RLuF=m?`*<JEA5+o^Jezl+b?^chVO>f9=6|)?O`(gxc_Z()_*j8
z@#oetfXQQ^K0@E0^}kMue<l__;bY>j25*l~9}Xrzo}VA_V7hqPxR)8g0$sO<mG1yG
z1LJ_TYXiQ{7>t?Yc;=q~3DbFw94O|@o8J!n#C0#7>nvr>B5(|9<fLwg8aw#u8{}Bl
zrEnI4S`;bwmV#-SWSNwfMY=3f%q?cF#ziNIMcrM+(pxOaS)RzSMc`08^@=5Ku;Tjd
zB%DO8a-Rh;ISGk-fM@avZ*1!%*63J5RgpRiCB&+H6_!xU>C(*1%bej-w+uTQO}`8#
zwpbcsli`DlF1su&;>z8ixQN=vmN!EC3@(WM3i*JrmFwfXe?ap!^ckN!(~9OSdNlur
z=GJ-aRL}KzIZKXyZ^hyNCqPncU5}ku1)_vigrr=BgkL9?pvnD3C~}jXIG}hPhUOvT
zWo#LzjMFks7#EBS-(o)R=hVqDRv8^dfCDn8TQ9d@K>%E77)1RJku(?D8?;ESa+8o}
zcq`6I9y=ziP#lIZYDA1RC|+r1sRqGsfubxHC-lnZEMYOY!9TGChK!?Oy^54^>V;p%
z3O}S-{Z?H<d7JZ$!H7jhB;MhvrdJ7-A>BahfQ}84a0VKQ9Wl!DRjzQh*T>?<HMtkY
z#aE*n8|^g{8%`!*>qu{19f;U}q%cS-BGH($)}Do%funyK+uszPE7p+8tls-BdCJ#C
z)Xi(a{m>Qx5|&`K*MEvHA)duswL%^TF~{Ordw*d&cX#y!3$I&6!+JTh#Zl+=UlDrm
A@&Et;

delta 1167
zcmZWoJ#W-N5S?8+iNl2$2%PUogZPkA@(0KPItoe(OB6_me?f)!M1e$wbQRs2(xN~@
zDG_vtii#>#BsVnasmyybwqinYr+u^Y-n^L|f1Q0VKFz%Uxc&LMznvZ&=a28d{&VwC
zL>9;Sk8e*zHs+GYH`DirA0AB?zh3^n_htX*V*P6KZnY`mMO?sNw6n*#)U!j}^>HU2
z=Q7^X{50$!{!}D&vJ*s_mB<qJ%a9@_l7vgrMv)e=_8m05M_z##IU*T2QhRBtm6vXH
z7Nk&z#6}Z6got-R+?A8K0c941C`>K`4SO}&^k<sv*o@{CFbPv?Ac0l_9U2@o5~=8T
z83zJ|3v_8o)&*luPJ@}GA)3_AMzId@7Qd4~lbnE8+=e}!7<ujg`PGQPgd7eZsz9y;
zm$hn6WJ_@&T}^Yu7ttL#m|!3$kz9=mIA+2)=(;bgoSK-tE6}OZUYH_RQT&D$cbJOM
zd5=AC30(F#1#W<wm}x%Wvki0bIZ1opZUwV(0?a+4{srjS6Y5?C+*Q%K$>3ZdVo5lA
zlD5wgrswb+1x(Q1oeO$~OYVf~+ai}?2FyCFX|YNWEaMEF@SQ9;PT+l4gIM3eeX3u9
zgrN&gg+ETs7SWm*8bDrTE+@jmm{uH$Z{h5oA&3in1vVxoacl#L6Jd-biXcxh<D*fN
z)9*zVSXA%V&nNpYfNI+kuB^3q4H-iPs$T}SHRVJ8tIY3dd^b2@9yX}<sPe#_uItI3
KYu87Uw|@a(WZ=I5

diff --git a/bgfx/shaders/gles/chains/hlsl/fs_post.bin b/bgfx/shaders/gles/chains/hlsl/fs_post.bin
index 3969bd47936cae4710416bfcd9e0c9defd1d9615..185b92fa882605273f9fc67b67bf5ab64595b7f3 100644
GIT binary patch
delta 536
zcmZovnW?@(f{Cd{aI+Ls7B^3Da$=ryetuC(yrJRb54?tx?F0-NttS`qN(&iVb18s9
zNp3+|Vo|)I@#J~DQR+GQ<pm09Ir)ht3NQ&1bd@Fwwv!L=2PneCk!?}1RY(R~XrxyO
zw#e8NrYti}K|`Z7zOXbgB|arHw^*-I!NyhrC{mnXT9lj$6Vp;Kn!J%qT++}KXqJY7
zo~eSq0*bE5@|=qGU|9n_1DN5pFb0}qG~ljL(1!cSR1=qK4HWHKK#Nfvr>UR?c5w3K
zR6Z#tO|S>m%wUGW0?Z8P@Z!uo4HUyBxASe_H3RC0tD5Y>U&{&OnM@WCkkB^PghmR`
vu`rf`2270+l5XS8)dH-H0_G6AVJgfgPY^U^G@pD-P@e}Z1q_y2E-nTDaEX?k

delta 241
zcmbQK-l(!cf{Ez~|7IzsEbhti0vtky)?5l;P?B3vmRJ;TXgFDcFKY5HUXjUbcty>M
zGxIbwG@wcp6f~0a^NUjAjr1xNv=mC?i}Op1l2hYTGINXdDm7uMv=k;!6cC+kE+EVS
z71EsCE3kpr2&e~Ui_v5+!P?1-`1~hd5R?!zgzME-fSID8G5H{`ArF!s!_C4%tc(K2
i5EsKtGM@ZeKx(p+ur#Cb<Tzn{9<X$+HCHVc7XtuQ?LFN9

diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_post.bin b/bgfx/shaders/glsl/chains/hlsl/fs_post.bin
index 60cc2675a2258ab235ece2d747a88c7c6fc7cf34..eda1c602e9f464a89e769d716abfb078f1e01104 100644
GIT binary patch
delta 568
zcmZ3Wv`}?}1QSz>z-B3?DO|k4$%%Q+`T0dD@rH)hlNa)cPB!2bot(sP$Oz_%7+Z5G
zfI&%aL0Mu^yrHpz?c@Z0(aHCD0!2*FB~5^mPxt~9VdBW9E7&R|gDo=Bs|1^EYzkAB
znWmtjQ5s)ZnwS!wl9^kqSE*oQs{j-!&Mz%WPKAkSDHu(*=M<MTGzFTaVW4NKps#?U
zYw~<{#d@%;ft~@(@LCuH%`qBq*C=Q!z<g(_iA%Kxigqoa#VC%`RL}xDI9Vn!FDElE
zHNH4GF(*~80w`>(XJ}$*YH6&g3HG*{8O#cprDj0y6ldmXpja_^HSY#qGoW_3s>vCA
zwLUPOi6%5&6cjWyL6*ZLjNua63UDPFFj*sHm5b-|GYXhPTmw^JK6$->DWm!1rvmys
NU@2hm)pBt$002G!o{<0m

delta 246
zcmZ3ex<F}z1QQc8|7IzsDO{81@p1?mT5~CYK}l{wSz=MVq2XjZ-i*l?ctq`rGxIbw
zG@#N73L44z`9&%5MtYSBS_-A{#rdU0$*J)vnYqP!m6|YBS_&}MWLtg(4k$-+@+|%h
zf<{1nFk6f?brduvFBA}-oF|Yrc{i{B<hueAB8G5tv=Qbw@QP0U!6V0mq}y<@f*_-S
fF~sRGBaJ5;2$?b(Pfiok=K)LAT65KMaWMb@V|qP4

diff --git a/bgfx/shaders/metal/chains/hlsl/fs_post.bin b/bgfx/shaders/metal/chains/hlsl/fs_post.bin
index 2be5d0aaa6e73cab5ef6677f800ca28293d63135..e261b0e64316685f0729ab0b0f6bb5bb111ece33 100644
GIT binary patch
delta 596
zcmeyZen*SPE!cyFvH8<O1_oczjXXWPJi*C{dCvLyMJe%y#*@GB>P&tlAT;>|uhZn2
ze4>mRlOGBQPd4U@V97|#Nt@ikFE`m-FfrDeO92d!^(xpZB!i7H(yN5Yr{&})mME0u
z7L+9x#T%N#gfr6=G&JIKOLF2%^-ALlOA}M#Q!;al^(qx?Y!x&nH?WJcRw`&I7)`#%
zB_VGPG+4tx&s0HQ0h^Y|2JDJyh9E@-dIm5HYGDjC2Wr4wsGyB-mL@LM8YtSeCfBoz
zu~cd*Xia_~ATpVqUwCp8pZMe;AyLud%sdTL#o9oByylac?8NUcWC=4L77&(`7xP=F
z8^N7h5pQGw@+C~(0_b@-d-6wanaOejl}ttklV=JPGFndN7Sx%{Bq(gF2?j`NO*J*4
z5d-udjD;}P1X=0i`+`NnMuuokGcuf<B6OSyNa+g82pSndq@ivxGMXGE?85}4RtTGd
IsQbb)0BNSD=l}o!

delta 311
zcmcbk^;@0CE!cyFvH8<O28K7n8+m$oC$AOY5HhyrQUHUJ+=8;iqIg5&$!B;YChy`E
zn|z*EYH|o);N;~3e3Mo9M5T)}^E5Oxpvn~#G?Mf4i&El^^ePp!CfBoz@l<NU<g^qf
z-xrXX+$|u?0Tt4md|M!Y@+Lmf$?<}w>W1bpTPxxX%@u4FG+?%yDrhOd*^@tV%S^s5
zSjl8)J~>FJkkM@N5h0z)$N3T`{}hteG0}wEr>y|98DWw!l1V0$9fXS}ZxIlid_wpL
klcB}rJ`ou~LraJwVAfeq-Yw$8WN0~=Q`8hhIf%*t04e`heE<Le

diff --git a/hlsl/post.fx b/hlsl/post.fx
index eddc4bb8da5..93a871a629a 100644
--- a/hlsl/post.fx
+++ b/hlsl/post.fx
@@ -98,7 +98,7 @@ VS_OUTPUT vs_main(VS_INPUT Input)
 
 	Output.TexCoord = Input.TexCoord;
 	Output.TexCoord += PrepareBloom
-		? 0.0f / TargetDims  // use half texel offset (DX9) to do the blur for first bloom layer
+		? 0.0f               // use half texel offset (DX9) to do the blur for first bloom layer
 		: 0.5f / TargetDims; // fix half texel offset (DX9)
 
 	Output.ScreenCoord = Input.Position.xy / ScreenDims;
@@ -252,7 +252,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 * SourceDims.y * ScanlineScale * PI;
+			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 *= SourceDims.y * ScanlineScale * PI;
+
 			float ScanlineCoordJitter = ScanlineOffset * PHI;
 			float ScanlineSine = sin(ScanlineCoord + ScanlineCoordJitter);
 			float ScanlineWide = ScanlineHeight + ScanlineVariation * max(1.0f, ScanlineHeight) * (1.0f - ColorBrightness);
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 ee2fd0fd148..9d5b99d0546 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
@@ -148,7 +148,13 @@ void main()
 
 			float ColorBrightness = 0.299 * BaseColor.r + 0.587 * BaseColor.g + 0.114 * BaseColor.b;
 
-			float ScanCoord = BaseCoord.y * u_source_dims.y * u_scanline_scale.x * 3.1415927; // PI
+			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_source_dims.y * u_scanline_scale.x * 3.1415927; // PI
+
 			float ScanCoordJitter = u_scanline_jitter.x * u_jitter_amount.x * 1.618034; // PHI
 			float ScanSine = sin(ScanCoord + ScanCoordJitter);
 			float ScanlineWide = u_scanline_height.x + u_scanline_variation.x * max(1.0, u_scanline_height.x) * (1.0 - ColorBrightness);