From 4cccc0183cef3dc959500d708256d18a98a62c46 Mon Sep 17 00:00:00 2001 From: MooglyGuy Date: Sun, 24 Nov 2019 15:40:14 +0100 Subject: -bgfx: Fixed Github issues #5830 and #5956. [Ryan Holtz] --- bgfx/chains/crt-geom-deluxe.json | 1 + bgfx/chains/crt-geom.json | 1 + bgfx/chains/default.json | 1 + bgfx/chains/eagle/super-eagle.json | 1 + bgfx/chains/hqx/hq2x.json | 1 + bgfx/chains/hqx/hq3x.json | 1 + bgfx/chains/hqx/hq4x.json | 1 + bgfx/chains/lut.json | 1 + bgfx/chains/unfiltered.json | 1 + bgfx/chains/xbr/super-2xbr-3d-2p.json | 1 + bgfx/chains/xbr/super-2xbr-3d-3p-smoother.json | 1 + bgfx/chains/xbr/super-4xbr-3d-4p.json | 1 + bgfx/chains/xbr/super-4xbr-3d-6p-smoother.json | 1 + bgfx/chains/xbr/super-xbr-2p.json | 1 + bgfx/chains/xbr/super-xbr-3p-smoother.json | 1 + bgfx/chains/xbr/super-xbr-6p.json | 1 + bgfx/chains/xbr/super-xbr-deposterize.json | 1 + bgfx/chains/xbr/super-xbr-fast-3p.json | 1 + bgfx/chains/xbr/super-xbr-fast-6p.json | 1 + bgfx/chains/xbr/xbr-hybrid.json | 1 + bgfx/chains/xbr/xbr-lv1-noblend.json | 1 + bgfx/chains/xbr/xbr-lv2-3d.json | 1 + bgfx/chains/xbr/xbr-lv2-accuracy-multipass.json | 1 + bgfx/chains/xbr/xbr-lv2-accuracy-smart-blur.json | 1 + bgfx/chains/xbr/xbr-lv2-deposterize.json | 1 + bgfx/chains/xbr/xbr-lv2-fast.json | 1 + bgfx/chains/xbr/xbr-lv2-multipass.json | 1 + bgfx/chains/xbr/xbr-lv2-noblend.json | 1 + bgfx/chains/xbr/xbr-lv2.json | 1 + bgfx/chains/xbr/xbr-lv3-multipass.json | 1 + bgfx/chains/xbr/xbr-lv3-noblend.json | 1 + bgfx/chains/xbr/xbr-lv3.json | 1 + bgfx/chains/xbr/xbr-mlv4-dilation.json | 1 + bgfx/chains/xbr/xbr-mlv4-multipass.json | 1 + bgfx/effects/default/blit.json | 21 ----------------- bgfx/effects/misc/bcg_adjust.json | 26 +++++++++++++++++++++ bgfx/shaders/dx11/chains/misc/fs_blit_bcg.bin | Bin 0 -> 804 bytes bgfx/shaders/dx9/chains/misc/fs_blit_bcg.bin | Bin 0 -> 569 bytes bgfx/shaders/essl/chains/misc/fs_blit_bcg.bin | Bin 0 -> 830 bytes bgfx/shaders/glsl/chains/misc/fs_blit_bcg.bin | Bin 0 -> 787 bytes bgfx/shaders/metal/chains/misc/fs_blit_bcg.bin | Bin 0 -> 1059 bytes bgfx/shaders/metal/chains/misc/fs_blit_yuy16.bin | Bin 1846 -> 1794 bytes .../chains/misc/fs_bob-and-ghost-deinterlace.bin | Bin 1685 -> 1650 bytes bgfx/shaders/metal/chains/misc/fs_saturation.bin | Bin 862 -> 838 bytes .../metal/chains/misc/vs_deposterize-pass0.bin | Bin 1167 -> 1152 bytes .../metal/chains/misc/vs_deposterize-pass1.bin | Bin 1167 -> 1152 bytes bgfx/shaders/spirv/chains/misc/fs_blit.bin | Bin 846 -> 846 bytes bgfx/shaders/spirv/chains/misc/fs_blit_bcg.bin | Bin 0 -> 1992 bytes .../spirv/chains/misc/fs_blit_palette16.bin | Bin 1580 -> 1580 bytes bgfx/shaders/spirv/chains/misc/fs_blit_rgb32.bin | Bin 950 -> 950 bytes bgfx/shaders/spirv/chains/misc/fs_blit_yuy16.bin | Bin 2740 -> 2740 bytes .../chains/misc/fs_bob-and-ghost-deinterlace.bin | Bin 2757 -> 2757 bytes .../spirv/chains/misc/fs_deposterize-pass0.bin | Bin 2506 -> 2506 bytes .../spirv/chains/misc/fs_deposterize-pass1.bin | Bin 2506 -> 2506 bytes bgfx/shaders/spirv/chains/misc/fs_lut.bin | Bin 1804 -> 1804 bytes bgfx/shaders/spirv/chains/misc/fs_saturation.bin | Bin 1469 -> 1469 bytes bgfx/shaders/spirv/chains/misc/vs_blit.bin | Bin 1305 -> 1305 bytes .../chains/misc/vs_bob-and-ghost-deinterlace.bin | Bin 1305 -> 1305 bytes .../spirv/chains/misc/vs_deposterize-pass0.bin | Bin 1771 -> 1771 bytes .../spirv/chains/misc/vs_deposterize-pass1.bin | Bin 1771 -> 1771 bytes bgfx/shaders/spirv/chains/misc/vs_lut.bin | Bin 1305 -> 1305 bytes bgfx/shaders/spirv/chains/misc/vs_saturation.bin | Bin 1305 -> 1305 bytes 62 files changed, 60 insertions(+), 21 deletions(-) create mode 100644 bgfx/effects/misc/bcg_adjust.json create mode 100644 bgfx/shaders/dx11/chains/misc/fs_blit_bcg.bin create mode 100644 bgfx/shaders/dx9/chains/misc/fs_blit_bcg.bin create mode 100644 bgfx/shaders/essl/chains/misc/fs_blit_bcg.bin create mode 100644 bgfx/shaders/glsl/chains/misc/fs_blit_bcg.bin create mode 100644 bgfx/shaders/metal/chains/misc/fs_blit_bcg.bin create mode 100644 bgfx/shaders/spirv/chains/misc/fs_blit_bcg.bin (limited to 'bgfx') diff --git a/bgfx/chains/crt-geom-deluxe.json b/bgfx/chains/crt-geom-deluxe.json index 49b91437818..d71df646d7b 100644 --- a/bgfx/chains/crt-geom-deluxe.json +++ b/bgfx/chains/crt-geom-deluxe.json @@ -156,6 +156,7 @@ "passes": [ { "effect": "crt-geom/phosphor_apply", + "applytint": true, "name": "phosphor apply", "uniforms": [ { "uniform": "u_phosphor_power", "slider": "phosphor_power" }, diff --git a/bgfx/chains/crt-geom.json b/bgfx/chains/crt-geom.json index c8bc2a2e2ab..56e2210cbdb 100644 --- a/bgfx/chains/crt-geom.json +++ b/bgfx/chains/crt-geom.json @@ -108,6 +108,7 @@ "passes": [ { "effect": "crt-geom/crt-geom", + "applytint": true, "name": "CRT", "uniforms": [ { "uniform": "curvature", "slider": "curvature" }, diff --git a/bgfx/chains/default.json b/bgfx/chains/default.json index d7e31536780..b2c6aed2378 100644 --- a/bgfx/chains/default.json +++ b/bgfx/chains/default.json @@ -8,6 +8,7 @@ ], "passes": [ { "effect": "misc/blit", + "applytint": true, "name": "Copy To Filtered Texture", "input": [ { "sampler": "s_tex", "texture": "screen" } diff --git a/bgfx/chains/eagle/super-eagle.json b/bgfx/chains/eagle/super-eagle.json index 017c03b7179..fc88e38c40a 100644 --- a/bgfx/chains/eagle/super-eagle.json +++ b/bgfx/chains/eagle/super-eagle.json @@ -26,6 +26,7 @@ "passes": [ { "effect": "eagle/supereagle", + "applytint": true, "name": "Super Eagle pass", "input": [ { "sampler": "decal", "texture": "screen" }, diff --git a/bgfx/chains/hqx/hq2x.json b/bgfx/chains/hqx/hq2x.json index b206d2ea663..c60f46c1be8 100644 --- a/bgfx/chains/hqx/hq2x.json +++ b/bgfx/chains/hqx/hq2x.json @@ -43,6 +43,7 @@ "passes": [ { "effect": "hqx/hq2x", + "applytint": true, "name": "HQ2x pass", "input": [ { "sampler": "decal", "texture": "screen" }, diff --git a/bgfx/chains/hqx/hq3x.json b/bgfx/chains/hqx/hq3x.json index 0ee2e277912..3f5815cf7a4 100644 --- a/bgfx/chains/hqx/hq3x.json +++ b/bgfx/chains/hqx/hq3x.json @@ -43,6 +43,7 @@ "passes": [ { "effect": "hqx/hq3x", + "applytint": true, "name": "HQ3x pass", "input": [ { "sampler": "decal", "texture": "screen" }, diff --git a/bgfx/chains/hqx/hq4x.json b/bgfx/chains/hqx/hq4x.json index 792cc666219..17abf352797 100644 --- a/bgfx/chains/hqx/hq4x.json +++ b/bgfx/chains/hqx/hq4x.json @@ -43,6 +43,7 @@ "passes": [ { "effect": "hqx/hq4x", + "applytint": true, "name": "HQ4x pass", "input": [ { "sampler": "decal", "texture": "screen" }, diff --git a/bgfx/chains/lut.json b/bgfx/chains/lut.json index 50353b5292b..6143410f009 100644 --- a/bgfx/chains/lut.json +++ b/bgfx/chains/lut.json @@ -10,6 +10,7 @@ "passes": [ { "effect": "misc/blit", + "applytint": true, "name": "Copy To Filtered Texture", "input": [ { "sampler": "s_tex", "texture": "screen" } diff --git a/bgfx/chains/unfiltered.json b/bgfx/chains/unfiltered.json index 6a65031f349..c69bcd319b5 100644 --- a/bgfx/chains/unfiltered.json +++ b/bgfx/chains/unfiltered.json @@ -2,6 +2,7 @@ "author": "Ryan Holtz", "passes": [ { "effect": "misc/blit", + "applytint": true, "name": "Unfiltered Upscale", "input": [ { "sampler": "s_tex", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-2xbr-3d-2p.json b/bgfx/chains/xbr/super-2xbr-3d-2p.json index a196141548d..1fafe6497f1 100644 --- a/bgfx/chains/xbr/super-2xbr-3d-2p.json +++ b/bgfx/chains/xbr/super-2xbr-3d-2p.json @@ -42,6 +42,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-2xbr-3d-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-2xbr-3d-3p-smoother.json b/bgfx/chains/xbr/super-2xbr-3d-3p-smoother.json index d3e3d33d7c4..307e0b6a149 100644 --- a/bgfx/chains/xbr/super-2xbr-3d-3p-smoother.json +++ b/bgfx/chains/xbr/super-2xbr-3d-3p-smoother.json @@ -42,6 +42,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-2xbr-3d-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-4xbr-3d-4p.json b/bgfx/chains/xbr/super-4xbr-3d-4p.json index 046897b62d5..cd1fa47ff73 100644 --- a/bgfx/chains/xbr/super-4xbr-3d-4p.json +++ b/bgfx/chains/xbr/super-4xbr-3d-4p.json @@ -42,6 +42,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-4xbr-3d-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-4xbr-3d-6p-smoother.json b/bgfx/chains/xbr/super-4xbr-3d-6p-smoother.json index f3bd617258f..b3ef9004d82 100644 --- a/bgfx/chains/xbr/super-4xbr-3d-6p-smoother.json +++ b/bgfx/chains/xbr/super-4xbr-3d-6p-smoother.json @@ -42,6 +42,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-4xbr-3d-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-xbr-2p.json b/bgfx/chains/xbr/super-xbr-2p.json index cdb8c3f84a5..d4fabc092ad 100644 --- a/bgfx/chains/xbr/super-xbr-2p.json +++ b/bgfx/chains/xbr/super-xbr-2p.json @@ -49,6 +49,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-xbr-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-xbr-3p-smoother.json b/bgfx/chains/xbr/super-xbr-3p-smoother.json index 96bda7904b6..487b62059e0 100644 --- a/bgfx/chains/xbr/super-xbr-3p-smoother.json +++ b/bgfx/chains/xbr/super-xbr-3p-smoother.json @@ -49,6 +49,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-xbr-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-xbr-6p.json b/bgfx/chains/xbr/super-xbr-6p.json index 4f5c69369d7..3c3a867df88 100644 --- a/bgfx/chains/xbr/super-xbr-6p.json +++ b/bgfx/chains/xbr/super-xbr-6p.json @@ -63,6 +63,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-xbr-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-xbr-deposterize.json b/bgfx/chains/xbr/super-xbr-deposterize.json index 8eac3770465..4a1ec028bbf 100644 --- a/bgfx/chains/xbr/super-xbr-deposterize.json +++ b/bgfx/chains/xbr/super-xbr-deposterize.json @@ -48,6 +48,7 @@ "passes": [ { "effect": "misc/deposterize-pass0", + "applytint": true, "name": "Deposterize, Pass 0", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-xbr-fast-3p.json b/bgfx/chains/xbr/super-xbr-fast-3p.json index f0d0411acc0..92d067c67b8 100644 --- a/bgfx/chains/xbr/super-xbr-fast-3p.json +++ b/bgfx/chains/xbr/super-xbr-fast-3p.json @@ -42,6 +42,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-xbr-fast-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/super-xbr-fast-6p.json b/bgfx/chains/xbr/super-xbr-fast-6p.json index 6d19e28f9b2..bd97d17a496 100644 --- a/bgfx/chains/xbr/super-xbr-fast-6p.json +++ b/bgfx/chains/xbr/super-xbr-fast-6p.json @@ -55,6 +55,7 @@ "passes": [ { "effect": "xbr/super-xbr/super-xbr-fast-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "s0", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-hybrid.json b/bgfx/chains/xbr/xbr-hybrid.json index 4529f829423..9c187c7cd7c 100644 --- a/bgfx/chains/xbr/xbr-hybrid.json +++ b/bgfx/chains/xbr/xbr-hybrid.json @@ -22,6 +22,7 @@ "passes": [ { "effect": "xbr/xbr-hybrid/2xbr-hybrid-v4b", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv1-noblend.json b/bgfx/chains/xbr/xbr-lv1-noblend.json index f5353a0b6b6..b350a3bf279 100644 --- a/bgfx/chains/xbr/xbr-lv1-noblend.json +++ b/bgfx/chains/xbr/xbr-lv1-noblend.json @@ -32,6 +32,7 @@ "passes": [ { "effect": "xbr/xbr-lv1-noblend", + "applytint": true, "name": "Main Pass", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv2-3d.json b/bgfx/chains/xbr/xbr-lv2-3d.json index accc199ee3d..74bc2d4c5b4 100644 --- a/bgfx/chains/xbr/xbr-lv2-3d.json +++ b/bgfx/chains/xbr/xbr-lv2-3d.json @@ -32,6 +32,7 @@ "passes": [ { "effect": "xbr/xbr-lv2-3d", + "applytint": true, "name": "Main Pass", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv2-accuracy-multipass.json b/bgfx/chains/xbr/xbr-lv2-accuracy-multipass.json index 772703ec9eb..a4fcbdcb951 100644 --- a/bgfx/chains/xbr/xbr-lv2-accuracy-multipass.json +++ b/bgfx/chains/xbr/xbr-lv2-accuracy-multipass.json @@ -41,6 +41,7 @@ "passes": [ { "effect": "xbr/xbr-lv2-multipass/xbr-lv2-accuracy-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv2-accuracy-smart-blur.json b/bgfx/chains/xbr/xbr-lv2-accuracy-smart-blur.json index d37d687f7a0..03d9acd7f0d 100644 --- a/bgfx/chains/xbr/xbr-lv2-accuracy-smart-blur.json +++ b/bgfx/chains/xbr/xbr-lv2-accuracy-smart-blur.json @@ -21,6 +21,7 @@ "passes": [ { "effect": "xbr/xbr-lv2-multipass/xbr-lv2-accuracy-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv2-deposterize.json b/bgfx/chains/xbr/xbr-lv2-deposterize.json index 38b6fabd501..7c5099960fb 100644 --- a/bgfx/chains/xbr/xbr-lv2-deposterize.json +++ b/bgfx/chains/xbr/xbr-lv2-deposterize.json @@ -15,6 +15,7 @@ "passes": [ { "effect": "misc/deposterize-pass0", + "applytint": true, "name": "Deposterize, Pass 0", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv2-fast.json b/bgfx/chains/xbr/xbr-lv2-fast.json index dee37b63f50..ad39d50c046 100644 --- a/bgfx/chains/xbr/xbr-lv2-fast.json +++ b/bgfx/chains/xbr/xbr-lv2-fast.json @@ -32,6 +32,7 @@ "passes": [ { "effect": "xbr/xbr-lv2-fast", + "applytint": true, "name": "Main Pass", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv2-multipass.json b/bgfx/chains/xbr/xbr-lv2-multipass.json index 50a46de3287..64e500112b3 100644 --- a/bgfx/chains/xbr/xbr-lv2-multipass.json +++ b/bgfx/chains/xbr/xbr-lv2-multipass.json @@ -42,6 +42,7 @@ "passes": [ { "effect": "xbr/xbr-lv2-multipass/xbr-lv2-c-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv2-noblend.json b/bgfx/chains/xbr/xbr-lv2-noblend.json index 6469df993c5..d83225eea28 100644 --- a/bgfx/chains/xbr/xbr-lv2-noblend.json +++ b/bgfx/chains/xbr/xbr-lv2-noblend.json @@ -32,6 +32,7 @@ "passes": [ { "effect": "xbr/xbr-lv2-noblend", + "applytint": true, "name": "Main Pass", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv2.json b/bgfx/chains/xbr/xbr-lv2.json index fbcda45917d..6b098b5cec9 100644 --- a/bgfx/chains/xbr/xbr-lv2.json +++ b/bgfx/chains/xbr/xbr-lv2.json @@ -32,6 +32,7 @@ "passes": [ { "effect": "xbr/xbr-lv2", + "applytint": true, "name": "Main Pass", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv3-multipass.json b/bgfx/chains/xbr/xbr-lv3-multipass.json index 801ffff34da..18aed86e084 100644 --- a/bgfx/chains/xbr/xbr-lv3-multipass.json +++ b/bgfx/chains/xbr/xbr-lv3-multipass.json @@ -42,6 +42,7 @@ "passes": [ { "effect": "xbr/xbr-lv3-multipass/xbr-lv3-pass0", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv3-noblend.json b/bgfx/chains/xbr/xbr-lv3-noblend.json index eedfab7217d..37e006885d5 100644 --- a/bgfx/chains/xbr/xbr-lv3-noblend.json +++ b/bgfx/chains/xbr/xbr-lv3-noblend.json @@ -32,6 +32,7 @@ "passes": [ { "effect": "xbr/xbr-lv3-noblend", + "applytint": true, "name": "Main Pass", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-lv3.json b/bgfx/chains/xbr/xbr-lv3.json index 6d6046e9712..ca4866bee37 100644 --- a/bgfx/chains/xbr/xbr-lv3.json +++ b/bgfx/chains/xbr/xbr-lv3.json @@ -32,6 +32,7 @@ "passes": [ { "effect": "xbr/xbr-lv3", + "applytint": true, "name": "Main Pass", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-mlv4-dilation.json b/bgfx/chains/xbr/xbr-mlv4-dilation.json index a3dfd50e912..e0a55017754 100644 --- a/bgfx/chains/xbr/xbr-mlv4-dilation.json +++ b/bgfx/chains/xbr/xbr-mlv4-dilation.json @@ -56,6 +56,7 @@ "passes": [ { "effect": "xbr/xbr-mlv4-multipass/xbr-mlv4-pass1", + "applytint": true, "name": "Pass 1", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/chains/xbr/xbr-mlv4-multipass.json b/bgfx/chains/xbr/xbr-mlv4-multipass.json index decb4db3ec2..010a5f99250 100644 --- a/bgfx/chains/xbr/xbr-mlv4-multipass.json +++ b/bgfx/chains/xbr/xbr-mlv4-multipass.json @@ -49,6 +49,7 @@ "passes": [ { "effect": "xbr/xbr-mlv4-multipass/xbr-mlv4-pass1", + "applytint": true, "name": "Pass 0", "input": [ { "sampler": "decal", "texture": "screen" } diff --git a/bgfx/effects/default/blit.json b/bgfx/effects/default/blit.json index ed957e812b3..a3c21f4c964 100644 --- a/bgfx/effects/default/blit.json +++ b/bgfx/effects/default/blit.json @@ -6,27 +6,6 @@ // //============================================================ { - // blend (required): The blend state for this effect. - "blend": { - // equation (optional): What equation to perform on the source and destination blend values. - // values: "add", "sub", "revSub", "min", "max" - // default: "add" - // - // "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub" - "equation": "add", - - // blend function parameters (optional): What factors to use in the blend function when calculating the final pixel. - // values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha" - // defaults (srcColor, srcAlpha): "1" - // defaults (dstColor, dstAlpha): "0" - // - // "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha" - "srcColor": "srcalpha", - "dstColor": "1-srcalpha", - "srcAlpha": "srcalpha", - "dstAlpha": "1-srcalpha" - }, - // depth (required): The depth state for this effect. "depth": { // function (optional): The depth function to use when drawing. diff --git a/bgfx/effects/misc/bcg_adjust.json b/bgfx/effects/misc/bcg_adjust.json new file mode 100644 index 00000000000..545910e5224 --- /dev/null +++ b/bgfx/effects/misc/bcg_adjust.json @@ -0,0 +1,26 @@ +// license:BSD-3-Clause +// copyright-holders:Ryan Holtz +//=============================================================== +// +// bcg_adjust.json: Brightness/Contrast/Gamma adjustment. +// +//=============================================================== +{ + "blend": { + "equation": "add", + "srcColor": "srcalpha", + "dstColor": "1-srcalpha", + "srcAlpha": "srcalpha", + "dstAlpha": "1-srcalpha" + }, + "depth": { "function": "always", "writeenable": false }, + "cull": { "mode": "none" }, + "write": { "rgb": true, "alpha": true }, + "vertex": "chains/misc/vs_blit", + "fragment": "chains/misc/fs_blit_bcg", + "uniforms": [ + { "name": "s_tex", "type": "int", "values": [ 1.0 ] }, + { "name": "s_pal", "type": "int", "values": [ 1.0 ] }, + { "name": "u_inv_tex_size1", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] } + ] +} \ No newline at end of file diff --git a/bgfx/shaders/dx11/chains/misc/fs_blit_bcg.bin b/bgfx/shaders/dx11/chains/misc/fs_blit_bcg.bin new file mode 100644 index 00000000000..b1c9e92a142 Binary files /dev/null and b/bgfx/shaders/dx11/chains/misc/fs_blit_bcg.bin differ diff --git a/bgfx/shaders/dx9/chains/misc/fs_blit_bcg.bin b/bgfx/shaders/dx9/chains/misc/fs_blit_bcg.bin new file mode 100644 index 00000000000..34c03c8626d Binary files /dev/null and b/bgfx/shaders/dx9/chains/misc/fs_blit_bcg.bin differ diff --git a/bgfx/shaders/essl/chains/misc/fs_blit_bcg.bin b/bgfx/shaders/essl/chains/misc/fs_blit_bcg.bin new file mode 100644 index 00000000000..0b3f68af136 Binary files /dev/null and b/bgfx/shaders/essl/chains/misc/fs_blit_bcg.bin differ diff --git a/bgfx/shaders/glsl/chains/misc/fs_blit_bcg.bin b/bgfx/shaders/glsl/chains/misc/fs_blit_bcg.bin new file mode 100644 index 00000000000..6d501412a01 Binary files /dev/null and b/bgfx/shaders/glsl/chains/misc/fs_blit_bcg.bin differ diff --git a/bgfx/shaders/metal/chains/misc/fs_blit_bcg.bin b/bgfx/shaders/metal/chains/misc/fs_blit_bcg.bin new file mode 100644 index 00000000000..fa0181d4b98 Binary files /dev/null and b/bgfx/shaders/metal/chains/misc/fs_blit_bcg.bin differ diff --git a/bgfx/shaders/metal/chains/misc/fs_blit_yuy16.bin b/bgfx/shaders/metal/chains/misc/fs_blit_yuy16.bin index cd086562e78..5a3347b9461 100644 Binary files a/bgfx/shaders/metal/chains/misc/fs_blit_yuy16.bin and b/bgfx/shaders/metal/chains/misc/fs_blit_yuy16.bin differ diff --git a/bgfx/shaders/metal/chains/misc/fs_bob-and-ghost-deinterlace.bin b/bgfx/shaders/metal/chains/misc/fs_bob-and-ghost-deinterlace.bin index 4890df57e53..1a8c2b61c46 100644 Binary files a/bgfx/shaders/metal/chains/misc/fs_bob-and-ghost-deinterlace.bin and b/bgfx/shaders/metal/chains/misc/fs_bob-and-ghost-deinterlace.bin differ diff --git a/bgfx/shaders/metal/chains/misc/fs_saturation.bin b/bgfx/shaders/metal/chains/misc/fs_saturation.bin index cc5e1c52b64..b0f748aaa6e 100644 Binary files a/bgfx/shaders/metal/chains/misc/fs_saturation.bin and b/bgfx/shaders/metal/chains/misc/fs_saturation.bin differ diff --git a/bgfx/shaders/metal/chains/misc/vs_deposterize-pass0.bin b/bgfx/shaders/metal/chains/misc/vs_deposterize-pass0.bin index 1d21506a0b8..58de2c17249 100644 Binary files a/bgfx/shaders/metal/chains/misc/vs_deposterize-pass0.bin and b/bgfx/shaders/metal/chains/misc/vs_deposterize-pass0.bin differ diff --git a/bgfx/shaders/metal/chains/misc/vs_deposterize-pass1.bin b/bgfx/shaders/metal/chains/misc/vs_deposterize-pass1.bin index 877f0f3321c..95798b897d1 100644 Binary files a/bgfx/shaders/metal/chains/misc/vs_deposterize-pass1.bin and b/bgfx/shaders/metal/chains/misc/vs_deposterize-pass1.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_blit.bin b/bgfx/shaders/spirv/chains/misc/fs_blit.bin index 4d71b00e1f3..a08fb70c7e6 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_blit.bin and b/bgfx/shaders/spirv/chains/misc/fs_blit.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_blit_bcg.bin b/bgfx/shaders/spirv/chains/misc/fs_blit_bcg.bin new file mode 100644 index 00000000000..beed088c3bd Binary files /dev/null and b/bgfx/shaders/spirv/chains/misc/fs_blit_bcg.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_blit_palette16.bin b/bgfx/shaders/spirv/chains/misc/fs_blit_palette16.bin index 0de699278db..604197ef811 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_blit_palette16.bin and b/bgfx/shaders/spirv/chains/misc/fs_blit_palette16.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_blit_rgb32.bin b/bgfx/shaders/spirv/chains/misc/fs_blit_rgb32.bin index bd7bc7bb3ab..d602784f416 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_blit_rgb32.bin and b/bgfx/shaders/spirv/chains/misc/fs_blit_rgb32.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_blit_yuy16.bin b/bgfx/shaders/spirv/chains/misc/fs_blit_yuy16.bin index 4d4e3a64454..d939846fb34 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_blit_yuy16.bin and b/bgfx/shaders/spirv/chains/misc/fs_blit_yuy16.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_bob-and-ghost-deinterlace.bin b/bgfx/shaders/spirv/chains/misc/fs_bob-and-ghost-deinterlace.bin index 5791486e270..5579239421c 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_bob-and-ghost-deinterlace.bin and b/bgfx/shaders/spirv/chains/misc/fs_bob-and-ghost-deinterlace.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_deposterize-pass0.bin b/bgfx/shaders/spirv/chains/misc/fs_deposterize-pass0.bin index 0e2efcb82ca..b3f2533ce25 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_deposterize-pass0.bin and b/bgfx/shaders/spirv/chains/misc/fs_deposterize-pass0.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_deposterize-pass1.bin b/bgfx/shaders/spirv/chains/misc/fs_deposterize-pass1.bin index f287855f505..30c3a3f6b20 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_deposterize-pass1.bin and b/bgfx/shaders/spirv/chains/misc/fs_deposterize-pass1.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_lut.bin b/bgfx/shaders/spirv/chains/misc/fs_lut.bin index 15bd5b1e8d6..2a046164fd9 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_lut.bin and b/bgfx/shaders/spirv/chains/misc/fs_lut.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/fs_saturation.bin b/bgfx/shaders/spirv/chains/misc/fs_saturation.bin index 0d1a86a73d4..6c9449ed085 100644 Binary files a/bgfx/shaders/spirv/chains/misc/fs_saturation.bin and b/bgfx/shaders/spirv/chains/misc/fs_saturation.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/vs_blit.bin b/bgfx/shaders/spirv/chains/misc/vs_blit.bin index 49f68528d2c..7d21cea1f97 100644 Binary files a/bgfx/shaders/spirv/chains/misc/vs_blit.bin and b/bgfx/shaders/spirv/chains/misc/vs_blit.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/vs_bob-and-ghost-deinterlace.bin b/bgfx/shaders/spirv/chains/misc/vs_bob-and-ghost-deinterlace.bin index 49f68528d2c..7d21cea1f97 100644 Binary files a/bgfx/shaders/spirv/chains/misc/vs_bob-and-ghost-deinterlace.bin and b/bgfx/shaders/spirv/chains/misc/vs_bob-and-ghost-deinterlace.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/vs_deposterize-pass0.bin b/bgfx/shaders/spirv/chains/misc/vs_deposterize-pass0.bin index 626720b9f25..e0672497f82 100644 Binary files a/bgfx/shaders/spirv/chains/misc/vs_deposterize-pass0.bin and b/bgfx/shaders/spirv/chains/misc/vs_deposterize-pass0.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/vs_deposterize-pass1.bin b/bgfx/shaders/spirv/chains/misc/vs_deposterize-pass1.bin index 07a53c4c599..4756202c8e0 100644 Binary files a/bgfx/shaders/spirv/chains/misc/vs_deposterize-pass1.bin and b/bgfx/shaders/spirv/chains/misc/vs_deposterize-pass1.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/vs_lut.bin b/bgfx/shaders/spirv/chains/misc/vs_lut.bin index 49f68528d2c..7d21cea1f97 100644 Binary files a/bgfx/shaders/spirv/chains/misc/vs_lut.bin and b/bgfx/shaders/spirv/chains/misc/vs_lut.bin differ diff --git a/bgfx/shaders/spirv/chains/misc/vs_saturation.bin b/bgfx/shaders/spirv/chains/misc/vs_saturation.bin index 49f68528d2c..7d21cea1f97 100644 Binary files a/bgfx/shaders/spirv/chains/misc/vs_saturation.bin and b/bgfx/shaders/spirv/chains/misc/vs_saturation.bin differ -- cgit v1.2.3-70-g09d2