diff options
author | 2016-03-12 03:17:41 +0100 | |
---|---|---|
committer | 2016-03-13 15:51:20 +0100 | |
commit | 9c33c40b824b7db5a484d1c2633ecadbd6d48a03 (patch) | |
tree | d9d0b4928755ba6c026da307bfc36203fb7c0ecc /bgfx | |
parent | cd8f796df658caf91af31de35d87ab0de77e69e9 (diff) |
Fix up NTSC shaders, nw
Diffstat (limited to 'bgfx')
29 files changed, 26 insertions, 2 deletions
diff --git a/bgfx/chains/hlsl.json b/bgfx/chains/hlsl.json index df743cd9d7d..d9d85020bd5 100644 --- a/bgfx/chains/hlsl.json +++ b/bgfx/chains/hlsl.json @@ -40,6 +40,12 @@ "prescale": 1, "doublebuffer": true }, + { + "name": "deadend", + "mode": "guest", + "prescale": 1, + "doublebuffer": true + }, { "name": "native", "mode": "native", "prescale": 1, @@ -53,7 +59,7 @@ ], "passes": [ { "effect": "ntsc_encode", - "name": "NTSC Decode", + "name": "NTSC Encode", "disablewhen": [ { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 }, { "type": "slider", "condition": "equal", "combine": "or", "name": "ntsc", "value": 0 } @@ -108,7 +114,25 @@ ], "output": "guest" }, - { "effect": "blit", + { "effect": "color", + "name": "Color Convolution", + "disablewhen": [ + { "type": "slider", "condition": "equal", "name": "adjustments", "value": 0 } + ], + "uniforms": [ + { "uniform": "u_red_ratios", "slider": "red_ratios" }, + { "uniform": "u_grn_ratios", "slider": "grn_ratios" }, + { "uniform": "u_blu_ratios", "slider": "blu_ratios" }, + { "uniform": "u_offset", "slider": "offset" }, + { "uniform": "u_scale", "slider": "scale" }, + { "uniform": "u_saturation", "slider": "saturation" } + ], + "input": [ + { "sampler": "DiffuseSampler", "texture": "guest" } + ], + "output": "guest" + }, + { "effect": "blit", "name": "Prescale", "input": [ { "sampler": "s_tex", "texture": "guest" } diff --git a/bgfx/shaders/dx11/fs_blit.bin b/bgfx/shaders/dx11/fs_blit.bin Binary files differindex a85e820871c..bcc74538c33 100644 --- a/bgfx/shaders/dx11/fs_blit.bin +++ b/bgfx/shaders/dx11/fs_blit.bin diff --git a/bgfx/shaders/dx11/fs_color.bin b/bgfx/shaders/dx11/fs_color.bin Binary files differindex 0d67b7ae49a..29925bc9dd2 100644 --- a/bgfx/shaders/dx11/fs_color.bin +++ b/bgfx/shaders/dx11/fs_color.bin diff --git a/bgfx/shaders/dx11/fs_deconverge.bin b/bgfx/shaders/dx11/fs_deconverge.bin Binary files differindex 16f2c569081..7c949f52c1d 100644 --- a/bgfx/shaders/dx11/fs_deconverge.bin +++ b/bgfx/shaders/dx11/fs_deconverge.bin diff --git a/bgfx/shaders/dx11/fs_gui.bin b/bgfx/shaders/dx11/fs_gui.bin Binary files differindex d7b1df5f758..ab00cc60da6 100644 --- a/bgfx/shaders/dx11/fs_gui.bin +++ b/bgfx/shaders/dx11/fs_gui.bin diff --git a/bgfx/shaders/dx11/fs_ntsc_decode.bin b/bgfx/shaders/dx11/fs_ntsc_decode.bin Binary files differindex 8b8c4806386..0b32595c26b 100644 --- a/bgfx/shaders/dx11/fs_ntsc_decode.bin +++ b/bgfx/shaders/dx11/fs_ntsc_decode.bin diff --git a/bgfx/shaders/dx11/fs_ntsc_encode.bin b/bgfx/shaders/dx11/fs_ntsc_encode.bin Binary files differindex 739ac01c72f..f9f9d79fcdb 100644 --- a/bgfx/shaders/dx11/fs_ntsc_encode.bin +++ b/bgfx/shaders/dx11/fs_ntsc_encode.bin diff --git a/bgfx/shaders/dx11/fs_phosphor.bin b/bgfx/shaders/dx11/fs_phosphor.bin Binary files differindex 4de9fe2d94f..bdea6c132ea 100644 --- a/bgfx/shaders/dx11/fs_phosphor.bin +++ b/bgfx/shaders/dx11/fs_phosphor.bin diff --git a/bgfx/shaders/dx11/fs_ratios.bin b/bgfx/shaders/dx11/fs_ratios.bin Binary files differindex 74aaff2e824..0c321faea93 100644 --- a/bgfx/shaders/dx11/fs_ratios.bin +++ b/bgfx/shaders/dx11/fs_ratios.bin diff --git a/bgfx/shaders/dx11/fs_screen.bin b/bgfx/shaders/dx11/fs_screen.bin Binary files differindex 27b8da9aa5f..b8102b8b1c0 100644 --- a/bgfx/shaders/dx11/fs_screen.bin +++ b/bgfx/shaders/dx11/fs_screen.bin diff --git a/bgfx/shaders/dx11/fs_tint.bin b/bgfx/shaders/dx11/fs_tint.bin Binary files differindex 3c85a877510..bae1d78d0b5 100644 --- a/bgfx/shaders/dx11/fs_tint.bin +++ b/bgfx/shaders/dx11/fs_tint.bin diff --git a/bgfx/shaders/dx11/vs_blit.bin b/bgfx/shaders/dx11/vs_blit.bin Binary files differindex c9df5a9aa19..ef289c07bb2 100644 --- a/bgfx/shaders/dx11/vs_blit.bin +++ b/bgfx/shaders/dx11/vs_blit.bin diff --git a/bgfx/shaders/dx11/vs_color.bin b/bgfx/shaders/dx11/vs_color.bin Binary files differindex f4162cb7460..1f44cbbc0c3 100644 --- a/bgfx/shaders/dx11/vs_color.bin +++ b/bgfx/shaders/dx11/vs_color.bin diff --git a/bgfx/shaders/dx11/vs_deconverge.bin b/bgfx/shaders/dx11/vs_deconverge.bin Binary files differindex 1ff405263ad..f41efa6ecc2 100644 --- a/bgfx/shaders/dx11/vs_deconverge.bin +++ b/bgfx/shaders/dx11/vs_deconverge.bin diff --git a/bgfx/shaders/dx11/vs_gui.bin b/bgfx/shaders/dx11/vs_gui.bin Binary files differindex 38b6e0ca8ba..0645a268fc4 100644 --- a/bgfx/shaders/dx11/vs_gui.bin +++ b/bgfx/shaders/dx11/vs_gui.bin diff --git a/bgfx/shaders/dx11/vs_ntsc_decode.bin b/bgfx/shaders/dx11/vs_ntsc_decode.bin Binary files differindex 523172676c5..b52ec9d374d 100644 --- a/bgfx/shaders/dx11/vs_ntsc_decode.bin +++ b/bgfx/shaders/dx11/vs_ntsc_decode.bin diff --git a/bgfx/shaders/dx11/vs_ntsc_encode.bin b/bgfx/shaders/dx11/vs_ntsc_encode.bin Binary files differindex f063fcbb7bc..cb37598ab61 100644 --- a/bgfx/shaders/dx11/vs_ntsc_encode.bin +++ b/bgfx/shaders/dx11/vs_ntsc_encode.bin diff --git a/bgfx/shaders/dx11/vs_phosphor.bin b/bgfx/shaders/dx11/vs_phosphor.bin Binary files differindex 3c73f85053e..ca2a6ee9654 100644 --- a/bgfx/shaders/dx11/vs_phosphor.bin +++ b/bgfx/shaders/dx11/vs_phosphor.bin diff --git a/bgfx/shaders/dx11/vs_ratios.bin b/bgfx/shaders/dx11/vs_ratios.bin Binary files differindex 2dfcd19c4cd..87a97456f61 100644 --- a/bgfx/shaders/dx11/vs_ratios.bin +++ b/bgfx/shaders/dx11/vs_ratios.bin diff --git a/bgfx/shaders/dx11/vs_screen.bin b/bgfx/shaders/dx11/vs_screen.bin Binary files differindex d4c1054ae31..4b5f0d0f6f2 100644 --- a/bgfx/shaders/dx11/vs_screen.bin +++ b/bgfx/shaders/dx11/vs_screen.bin diff --git a/bgfx/shaders/dx11/vs_tint.bin b/bgfx/shaders/dx11/vs_tint.bin Binary files differindex 2aa021d990d..71db63aa558 100644 --- a/bgfx/shaders/dx11/vs_tint.bin +++ b/bgfx/shaders/dx11/vs_tint.bin diff --git a/bgfx/shaders/dx9/fs_ntsc_decode.bin b/bgfx/shaders/dx9/fs_ntsc_decode.bin Binary files differindex 988dd059efa..801e212fe1c 100644 --- a/bgfx/shaders/dx9/fs_ntsc_decode.bin +++ b/bgfx/shaders/dx9/fs_ntsc_decode.bin diff --git a/bgfx/shaders/dx9/fs_ntsc_encode.bin b/bgfx/shaders/dx9/fs_ntsc_encode.bin Binary files differindex 754b52af0e4..5aff8b1d48c 100644 --- a/bgfx/shaders/dx9/fs_ntsc_encode.bin +++ b/bgfx/shaders/dx9/fs_ntsc_encode.bin diff --git a/bgfx/shaders/gles/fs_ntsc_decode.bin b/bgfx/shaders/gles/fs_ntsc_decode.bin Binary files differindex 49458ff0b80..3676644d741 100644 --- a/bgfx/shaders/gles/fs_ntsc_decode.bin +++ b/bgfx/shaders/gles/fs_ntsc_decode.bin diff --git a/bgfx/shaders/gles/fs_ntsc_encode.bin b/bgfx/shaders/gles/fs_ntsc_encode.bin Binary files differindex 0d0bdbeea37..42a30179227 100644 --- a/bgfx/shaders/gles/fs_ntsc_encode.bin +++ b/bgfx/shaders/gles/fs_ntsc_encode.bin diff --git a/bgfx/shaders/glsl/fs_ntsc_decode.bin b/bgfx/shaders/glsl/fs_ntsc_decode.bin Binary files differindex 59fdbb640ed..aab5144f780 100644 --- a/bgfx/shaders/glsl/fs_ntsc_decode.bin +++ b/bgfx/shaders/glsl/fs_ntsc_decode.bin diff --git a/bgfx/shaders/glsl/fs_ntsc_encode.bin b/bgfx/shaders/glsl/fs_ntsc_encode.bin Binary files differindex 7a11254d662..23b12243808 100644 --- a/bgfx/shaders/glsl/fs_ntsc_encode.bin +++ b/bgfx/shaders/glsl/fs_ntsc_encode.bin diff --git a/bgfx/shaders/metal/fs_ntsc_decode.bin b/bgfx/shaders/metal/fs_ntsc_decode.bin Binary files differindex 22787c6ef21..ce6bc5aab2e 100644 --- a/bgfx/shaders/metal/fs_ntsc_decode.bin +++ b/bgfx/shaders/metal/fs_ntsc_decode.bin diff --git a/bgfx/shaders/metal/fs_ntsc_encode.bin b/bgfx/shaders/metal/fs_ntsc_encode.bin Binary files differindex 179129f0e95..c41d301b780 100644 --- a/bgfx/shaders/metal/fs_ntsc_encode.bin +++ b/bgfx/shaders/metal/fs_ntsc_encode.bin |