diff options
| author | 2016-04-17 20:43:10 +0200 | |
|---|---|---|
| committer | 2016-04-17 20:43:10 +0200 | |
| commit | e6a54bcc234061c8e5fa903f4734bf490da77ee4 (patch) | |
| tree | 4623926a0692b80412358e301df9fdb0b68f50cc | |
| parent | 250a5cc805a41409cbd6b8a1bfcb33e002e3f6f0 (diff) | |
Minor fixups to pillarboxing shaders
28 files changed, 52 insertions, 52 deletions
diff --git a/bgfx/chains/pillarbox_left_horizontal.json b/bgfx/chains/pillarbox_left_horizontal.json index deff01f88d6..1959fa30943 100644 --- a/bgfx/chains/pillarbox_left_horizontal.json +++ b/bgfx/chains/pillarbox_left_horizontal.json @@ -58,14 +58,10 @@ ], "output": "internal" }, - { - "effect": "pillarbox_left_horizontal/saturation", - "name": "Saturation Pass", - "disablewhen": [ - { "type": "slider", "condition": "equal", "name": "saturation", "value": 100 } - ], + { "effect": "pillarbox_left_horizontal/gaussian", + "name": "Gaussian Blur 2, Horizontal", "uniforms": [ - { "uniform": "u_saturation", "slider": "saturation" } + { "uniform": "u_dimension", "value": [ 1.0, 0.0 ] } ], "input": [ { "sampler": "s_tex", "target": "internal" } @@ -73,19 +69,23 @@ "output": "internal" }, { "effect": "pillarbox_left_horizontal/gaussian", - "name": "Gaussian Blur 2, Horizontal", + "name": "Gaussian Blur 2, Vertical", "uniforms": [ - { "uniform": "u_dimension", "value": [ 1.0, 0.0 ] } + { "uniform": "u_dimension", "value": [ 0.0, 1.0 ] } ], "input": [ { "sampler": "s_tex", "target": "internal" } ], "output": "internal" }, - { "effect": "pillarbox_left_horizontal/gaussian", - "name": "Gaussian Blur 2, Vertical", + { + "effect": "pillarbox_left_horizontal/saturation", + "name": "Saturation Pass", + "disablewhen": [ + { "type": "slider", "condition": "equal", "name": "saturation", "value": 100 } + ], "uniforms": [ - { "uniform": "u_dimension", "value": [ 0.0, 1.0 ] } + { "uniform": "u_saturation", "slider": "saturation" } ], "input": [ { "sampler": "s_tex", "target": "internal" } diff --git a/bgfx/chains/pillarbox_left_vertical.json b/bgfx/chains/pillarbox_left_vertical.json index 187164695de..976a84476b8 100644 --- a/bgfx/chains/pillarbox_left_vertical.json +++ b/bgfx/chains/pillarbox_left_vertical.json @@ -58,14 +58,10 @@ ], "output": "internal" }, - { - "effect": "pillarbox_left_vertical/saturation", - "name": "Saturation Pass", - "disablewhen": [ - { "type": "slider", "condition": "equal", "name": "saturation", "value": 100 } - ], + { "effect": "pillarbox_left_vertical/gaussian", + "name": "Gaussian Blur 2, Horizontal", "uniforms": [ - { "uniform": "u_saturation", "slider": "saturation" } + { "uniform": "u_dimension", "value": [ 1.0, 0.0 ] } ], "input": [ { "sampler": "s_tex", "target": "internal" } @@ -73,19 +69,23 @@ "output": "internal" }, { "effect": "pillarbox_left_vertical/gaussian", - "name": "Gaussian Blur 2, Horizontal", + "name": "Gaussian Blur 2, Vertical", "uniforms": [ - { "uniform": "u_dimension", "value": [ 1.0, 0.0 ] } + { "uniform": "u_dimension", "value": [ 0.0, 1.0 ] } ], "input": [ { "sampler": "s_tex", "target": "internal" } ], "output": "internal" }, - { "effect": "pillarbox_left_vertical/gaussian", - "name": "Gaussian Blur 2, Vertical", + { + "effect": "pillarbox_left_vertical/saturation", + "name": "Saturation Pass", + "disablewhen": [ + { "type": "slider", "condition": "equal", "name": "saturation", "value": 100 } + ], "uniforms": [ - { "uniform": "u_dimension", "value": [ 0.0, 1.0 ] } + { "uniform": "u_saturation", "slider": "saturation" } ], "input": [ { "sampler": "s_tex", "target": "internal" } diff --git a/bgfx/chains/pillarbox_right_horizontal.json b/bgfx/chains/pillarbox_right_horizontal.json index d7133aadbcc..a687510049e 100644 --- a/bgfx/chains/pillarbox_right_horizontal.json +++ b/bgfx/chains/pillarbox_right_horizontal.json @@ -58,14 +58,10 @@ ], "output": "internal" }, - { - "effect": "pillarbox_right_horizontal/saturation", - "name": "Saturation Pass", - "disablewhen": [ - { "type": "slider", "condition": "equal", "name": "saturation", "value": 100 } - ], + { "effect": "pillarbox_right_horizontal/gaussian", + "name": "Gaussian Blur 2, Horizontal", "uniforms": [ - { "uniform": "u_saturation", "slider": "saturation" } + { "uniform": "u_dimension", "value": [ 1.0, 0.0 ] } ], "input": [ { "sampler": "s_tex", "target": "internal" } @@ -73,19 +69,23 @@ "output": "internal" }, { "effect": "pillarbox_right_horizontal/gaussian", - "name": "Gaussian Blur 2, Horizontal", + "name": "Gaussian Blur 2, Vertical", "uniforms": [ - { "uniform": "u_dimension", "value": [ 1.0, 0.0 ] } + { "uniform": "u_dimension", "value": [ 0.0, 1.0 ] } ], "input": [ { "sampler": "s_tex", "target": "internal" } ], "output": "internal" }, - { "effect": "pillarbox_right_horizontal/gaussian", - "name": "Gaussian Blur 2, Vertical", + { + "effect": "pillarbox_right_horizontal/saturation", + "name": "Saturation Pass", + "disablewhen": [ + { "type": "slider", "condition": "equal", "name": "saturation", "value": 100 } + ], "uniforms": [ - { "uniform": "u_dimension", "value": [ 0.0, 1.0 ] } + { "uniform": "u_saturation", "slider": "saturation" } ], "input": [ { "sampler": "s_tex", "target": "internal" } diff --git a/bgfx/chains/pillarbox_right_vertical.json b/bgfx/chains/pillarbox_right_vertical.json index 072ba99956f..16dcb8b8c4b 100644 --- a/bgfx/chains/pillarbox_right_vertical.json +++ b/bgfx/chains/pillarbox_right_vertical.json @@ -58,14 +58,10 @@ ], "output": "internal" }, - { - "effect": "pillarbox_right_vertical/saturation", - "name": "Saturation Pass", - "disablewhen": [ - { "type": "slider", "condition": "equal", "name": "saturation", "value": 100 } - ], + { "effect": "pillarbox_right_vertical/gaussian", + "name": "Gaussian Blur 2, Horizontal", "uniforms": [ - { "uniform": "u_saturation", "slider": "saturation" } + { "uniform": "u_dimension", "value": [ 1.0, 0.0 ] } ], "input": [ { "sampler": "s_tex", "target": "internal" } @@ -73,19 +69,23 @@ "output": "internal" }, { "effect": "pillarbox_right_vertical/gaussian", - "name": "Gaussian Blur 2, Horizontal", + "name": "Gaussian Blur 2, Vertical", "uniforms": [ - { "uniform": "u_dimension", "value": [ 1.0, 0.0 ] } + { "uniform": "u_dimension", "value": [ 0.0, 1.0 ] } ], "input": [ { "sampler": "s_tex", "target": "internal" } ], "output": "internal" }, - { "effect": "pillarbox_right_vertical/gaussian", - "name": "Gaussian Blur 2, Vertical", + { + "effect": "pillarbox_right_vertical/saturation", + "name": "Saturation Pass", + "disablewhen": [ + { "type": "slider", "condition": "equal", "name": "saturation", "value": 100 } + ], "uniforms": [ - { "uniform": "u_dimension", "value": [ 0.0, 1.0 ] } + { "uniform": "u_saturation", "slider": "saturation" } ], "input": [ { "sampler": "s_tex", "target": "internal" } diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin Binary files differindex 8b8f91d8417..8d21d98385a 100644 --- a/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin +++ b/bgfx/shaders/dx11/chains/pillarbox_left_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin Binary files differindex f7a1c40ba4d..7a3bdff1a98 100644 --- a/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin +++ b/bgfx/shaders/dx11/chains/pillarbox_left_vertical/vs_saturation.bin diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin Binary files differindex b57b9cd3633..cde2b1546aa 100644 --- a/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin +++ b/bgfx/shaders/dx11/chains/pillarbox_right_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin Binary files differindex 7229773bd56..ce4ae1dd5c7 100644 --- a/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin +++ b/bgfx/shaders/dx11/chains/pillarbox_right_vertical/vs_saturation.bin diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin Binary files differindex bc748ecc4c2..b9b18b7ac1a 100644 --- a/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin +++ b/bgfx/shaders/dx9/chains/pillarbox_left_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin Binary files differindex d504cc35b51..0b92c5f50bc 100644 --- a/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin +++ b/bgfx/shaders/dx9/chains/pillarbox_left_vertical/vs_saturation.bin diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin Binary files differindex 628eff3b5ae..e9bfb3062de 100644 --- a/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin +++ b/bgfx/shaders/dx9/chains/pillarbox_right_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin Binary files differindex 1abeb7f7aed..55774bb38ab 100644 --- a/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin +++ b/bgfx/shaders/dx9/chains/pillarbox_right_vertical/vs_saturation.bin diff --git a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin Binary files differindex e17074932b6..42326d4324e 100644 --- a/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin +++ b/bgfx/shaders/gles/chains/pillarbox_left_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin Binary files differindex 5f5ba0d6aac..dbce619ef26 100644 --- a/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin +++ b/bgfx/shaders/gles/chains/pillarbox_left_vertical/vs_saturation.bin diff --git a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin Binary files differindex 20b51375de0..1e806909f59 100644 --- a/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin +++ b/bgfx/shaders/gles/chains/pillarbox_right_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin Binary files differindex 567cd53fd63..c0f4dfa5a88 100644 --- a/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin +++ b/bgfx/shaders/gles/chains/pillarbox_right_vertical/vs_saturation.bin diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin Binary files differindex 6319f0af6f2..061d861b6ed 100644 --- a/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin +++ b/bgfx/shaders/glsl/chains/pillarbox_left_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin Binary files differindex 0d8e84da2a0..de0d4115e79 100644 --- a/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin +++ b/bgfx/shaders/glsl/chains/pillarbox_left_vertical/vs_saturation.bin diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin Binary files differindex 3c794ab6004..c25635af5a8 100644 --- a/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin +++ b/bgfx/shaders/glsl/chains/pillarbox_right_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin Binary files differindex e0a84d1dba0..3b5a651f2e7 100644 --- a/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin +++ b/bgfx/shaders/glsl/chains/pillarbox_right_vertical/vs_saturation.bin diff --git a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin Binary files differindex 77a27dd0e00..79234729f36 100644 --- a/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin +++ b/bgfx/shaders/metal/chains/pillarbox_left_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin Binary files differindex 0b0b45bfd50..f9567cc2d50 100644 --- a/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin +++ b/bgfx/shaders/metal/chains/pillarbox_left_vertical/vs_saturation.bin diff --git a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin Binary files differindex beb3b436067..efd3de32003 100644 --- a/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin +++ b/bgfx/shaders/metal/chains/pillarbox_right_horizontal/vs_saturation.bin diff --git a/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin b/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin Binary files differindex 18d373c6e5c..5fdb790c191 100644 --- a/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin +++ b/bgfx/shaders/metal/chains/pillarbox_right_vertical/vs_saturation.bin diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc index 5ce10e25187..57be1439a8b 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_horizontal/vs_saturation.sc @@ -9,6 +9,6 @@ $output v_texcoord0, v_color0 void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); - v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.8, 1.0 * 0.8) + vec2(0.2, 0.1); + v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.9, 1.0 * 0.8) + vec2(0.1, 0.1); v_color0 = a_color0; } diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc index 3305b07810b..fc524496a1f 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_left_vertical/vs_saturation.sc @@ -9,6 +9,6 @@ $output v_texcoord0, v_color0 void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); - v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.740740 * 0.8) + vec2(0.1, 0.25926); + v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.685185 * 0.9) + vec2(0.1, 0.1); v_color0 = a_color0; } diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc index f142ef653b7..c0f9321abc1 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_horizontal/vs_saturation.sc @@ -9,6 +9,6 @@ $output v_texcoord0, v_color0 void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); - v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.8, 1.0 * 0.8) + vec2(1.0 - 0.3333333333, 0.1); + v_texcoord0 = a_texcoord0 * vec2(0.16666666 * 0.9, 1.0 * 0.8) + vec2(0.9 - 0.16666666 * 0.9, 0.1); v_color0 = a_color0; } diff --git a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc index ea4d47d9963..ef86b6a0a43 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/pillarbox_right_vertical/vs_saturation.sc @@ -9,6 +9,6 @@ $output v_texcoord0, v_color0 void main() { gl_Position = mul(u_viewProj, vec4(a_position.xy, 0.0, 1.0)); - v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.740740 * 0.8) + vec2(0.1, 0.055555); + v_texcoord0 = a_texcoord0 * vec2(1.0 * 0.8, 0.685185 * 0.9) + vec2(0.1, 0.9 - 0.685185 * 0.9); v_color0 = a_color0; } |
