From dba12a31ad01a00eb13eb9436977f16d0dd77af3 Mon Sep 17 00:00:00 2001 From: ImJezze Date: Fri, 22 Apr 2016 13:16:37 +0200 Subject: [PATCH] Small fixes (nw) - fixed not used u_humbar_hertz_rate parameter - fixed half pixel shift of the shadow mask along the screen diagonal --- bgfx/shaders/dx11/chains/hlsl/fs_post.bin | Bin 3095 -> 3165 bytes bgfx/shaders/dx9/chains/hlsl/fs_post.bin | Bin 2800 -> 2882 bytes bgfx/shaders/gles/chains/hlsl/fs_post.bin | Bin 3941 -> 4009 bytes bgfx/shaders/glsl/chains/hlsl/fs_post.bin | Bin 3733 -> 3795 bytes bgfx/shaders/metal/chains/hlsl/fs_post.bin | Bin 4477 -> 4512 bytes hlsl/post.fx | 18 +++++------ .../bgfx/shaders/chains/hlsl/fs_post.sc | 28 +++++++++--------- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/bgfx/shaders/dx11/chains/hlsl/fs_post.bin b/bgfx/shaders/dx11/chains/hlsl/fs_post.bin index 52f2fbaa78fdb8b81b7d37dbb08af8bbe7a97c24..4081afffd7a92c32a580ff124187cf7e5aebecc1 100644 GIT binary patch delta 304 zcmbO(aaV%VE!cyFvH8 zoPvx*AqD}UAbV+iL4J8^kr0CdgqN0+pAY020C{Ys@gX#LgrPWN{lY2rz)ui?u2MNruUO%#v(;3=CXG43jsqNw7EAyMYvJ=3xEJ$S6FS zh20uRInMp$ssMUgjfl~=;8dn3@G$0RX6qGFjGG3oMg;8+w K6z)c*1V#Y2g+c}Z delta 276 zcmcaBFSkH~@JeObiT>3=Ax8eF{Jx1B2-1 zPfYAgEPMvG%y;y%UG73$0W48v9P3*>uf}6Lo7c(-7Y}VpbX3`V@ zYPMit;80=^U;tUe)d0~b3}iDpFfil`HCstBFt933p2sCVc_Oz5qrl`_+>J~Di~!~J BJ$?WH diff --git a/bgfx/shaders/dx9/chains/hlsl/fs_post.bin b/bgfx/shaders/dx9/chains/hlsl/fs_post.bin index 3f2fbf2bd56ac378092853a7423f780b98d657bc..efd4837d48ac5a44c40011e962d27bae55204528 100644 GIT binary patch literal 2882 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 U>CJiUPVAysY|yKiyp?YQ0Qg=pm;e9( delta 95 zcmZ1}|5T3CE!cyFvH8?o~e!kkkFib jpVbvpNMf@+n=#|$JM0>p7qL6Bvl{3b7#L3e$+rOjir^f} diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_post.bin b/bgfx/shaders/glsl/chains/hlsl/fs_post.bin index 74c98b2d949c2dda3f9c93e2f3c0f4261dc7c94c..76201d8f610f51ec82b0293fc3a870504054395e 100644 GIT binary patch delta 145 zcmbO#ds&v#E!cyFvH89mX-OR$m$jEGt1gr+wYh;+n^8=oG`_GjF(p1FGq+f;qEbOu0jN}S T^G-G$c2O*L=v7R9#k(2+ryDRq delta 98 zcmcaCJ5`p`E!cyFvH8`I$|vq`YC8t54q7*5vUTMYoWF&o1G diff --git a/bgfx/shaders/metal/chains/hlsl/fs_post.bin b/bgfx/shaders/metal/chains/hlsl/fs_post.bin index 4ccc6e11b7b1fe3357b070f9c92a5cdf4eb18b32..25f3187fbe41b1ebc31585197daec216f3f15680 100644 GIT binary patch delta 114 zcmeyXv_P5LE!cyFvH8 0.0 ? canvasCoord.yx : canvasCoord.xy; - // swap x/y vector and raster in screen mode (not source mode) + // swap x/y in screen mode (not source mode) shadowCount = u_swap_xy.x > 0.0 ? shadowCount.yx : shadowCount.xy; @@ -85,7 +85,7 @@ vec2 GetShadowCoord(vec2 QuadCoord, vec2 SourceCoord) vec2 shadowFrac = fract(canvasCoord / shadowTile); - // swap x/y raster in screen mode (not vector and not source mode) + // swap x/y in screen mode (not source mode) shadowFrac = u_swap_xy.x > 0.0 ? shadowFrac.yx : shadowFrac.xy; @@ -97,7 +97,7 @@ vec2 GetShadowCoord(vec2 QuadCoord, vec2 SourceCoord) void main() { - vec2 BaseCoord = GetAdjustedCoords(v_texcoord0, vec2(0.5, 0.5)); + vec2 BaseCoord = GetAdjustedCoords(v_texcoord0); // Color vec4 BaseColor = texture2D(s_tex, BaseCoord); @@ -136,8 +136,8 @@ 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; - float ScanCoordJitter = u_scanline_jitter.x * u_jitter_amount.x * 1.618034; + float ScanCoord = BaseCoord.y * 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); float ScanSineScaled = pow(ScanSine * ScanSine, ScanlineWide); @@ -149,7 +149,7 @@ void main() // Hum Bar Simulation if (u_humbar_alpha.x > 0.0f) { - float HumTimeStep = fract(u_time.x * 0.001); + float HumTimeStep = fract(u_time.x * u_humbar_hertz_rate.x); float HumBrightness = 1.0 - fract(BaseCoord.y + HumTimeStep) * u_humbar_alpha.x; BaseColor.rgb *= HumBrightness; }