From 849654517072b6d11cc26fa03c186a3bc357bd8a Mon Sep 17 00:00:00 2001 From: MooglyGuy Date: Sat, 10 Jun 2017 12:50:05 +0200 Subject: -bgfx: Fixed the following xBR shaders: xBR-lv2-fast, xBR-lv2-noblend, xBR-lv2, xBR-lv3-noblend, and xBR-lv3. [Ryan Holtz] --- bgfx/chains/xbr/xbr-lv2-3d.json | 2 +- bgfx/chains/xbr/xbr-lv2-fast.json | 15 --------------- bgfx/chains/xbr/xbr-lv2-noblend.json | 15 --------------- bgfx/chains/xbr/xbr-lv2.json | 15 --------------- bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-3d.bin | Bin 9531 -> 9300 bytes bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-fast.bin | Bin 4949 -> 4942 bytes bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-noblend.bin | Bin 5120 -> 5395 bytes bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2.bin | Bin 5885 -> 6518 bytes bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3-noblend.bin | Bin 6332 -> 7423 bytes bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3.bin | Bin 8481 -> 7922 bytes bgfx/shaders/dx11/chains/xbr/vs_xbr-lv2-3d.bin | Bin 711 -> 1343 bytes bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-3d.bin | Bin 5140 -> 4693 bytes bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-fast.bin | Bin 2830 -> 2519 bytes bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-noblend.bin | Bin 2525 -> 2596 bytes bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2.bin | Bin 3342 -> 3235 bytes bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3-noblend.bin | Bin 3165 -> 3632 bytes bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3.bin | Bin 4394 -> 4011 bytes bgfx/shaders/dx9/chains/xbr/vs_xbr-lv2-3d.bin | Bin 514 -> 726 bytes bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-3d.bin | Bin 9638 -> 10107 bytes bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-fast.bin | Bin 5304 -> 5484 bytes bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-noblend.bin | Bin 7137 -> 7171 bytes bgfx/shaders/essl/chains/xbr/fs_xbr-lv2.bin | Bin 6336 -> 7246 bytes bgfx/shaders/essl/chains/xbr/fs_xbr-lv3-noblend.bin | Bin 8802 -> 9926 bytes bgfx/shaders/essl/chains/xbr/fs_xbr-lv3.bin | Bin 10312 -> 10691 bytes bgfx/shaders/essl/chains/xbr/vs_xbr-lv2-3d.bin | Bin 745 -> 2136 bytes bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-3d.bin | Bin 9322 -> 9773 bytes bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-fast.bin | Bin 5100 -> 5274 bytes bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-noblend.bin | Bin 6880 -> 6913 bytes bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2.bin | Bin 6083 -> 6982 bytes bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3-noblend.bin | Bin 8509 -> 9622 bytes bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3.bin | Bin 9927 -> 10315 bytes bgfx/shaders/glsl/chains/xbr/vs_xbr-lv2-3d.bin | Bin 673 -> 1980 bytes bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-3d.bin | Bin 13025 -> 13854 bytes bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-fast.bin | Bin 7331 -> 7759 bytes .../shaders/metal/chains/xbr/fs_xbr-lv2-noblend.bin | Bin 8537 -> 8592 bytes bgfx/shaders/metal/chains/xbr/fs_xbr-lv2.bin | Bin 8581 -> 10337 bytes .../shaders/metal/chains/xbr/fs_xbr-lv3-noblend.bin | Bin 10602 -> 12246 bytes bgfx/shaders/metal/chains/xbr/fs_xbr-lv3.bin | Bin 13301 -> 14093 bytes bgfx/shaders/metal/chains/xbr/vs_xbr-lv2-3d.bin | Bin 1097 -> 2515 bytes 39 files changed, 1 insertion(+), 46 deletions(-) (limited to 'bgfx') diff --git a/bgfx/chains/xbr/xbr-lv2-3d.json b/bgfx/chains/xbr/xbr-lv2-3d.json index 7403b3e5b1a..accc199ee3d 100644 --- a/bgfx/chains/xbr/xbr-lv2-3d.json +++ b/bgfx/chains/xbr/xbr-lv2-3d.json @@ -27,7 +27,7 @@ */ { - "name": "xBR-lv2-3d", + "name": "xBR-lv2 3D", "author": "Hyllian", "passes": [ { diff --git a/bgfx/chains/xbr/xbr-lv2-fast.json b/bgfx/chains/xbr/xbr-lv2-fast.json index b3b3a1e5141..dee37b63f50 100644 --- a/bgfx/chains/xbr/xbr-lv2-fast.json +++ b/bgfx/chains/xbr/xbr-lv2-fast.json @@ -29,13 +29,6 @@ { "name": "xBR-lv2 Fast", "author": "Hyllian", - "targets": [ - { - "name": "internal", - "mode": "guest", - "doublebuffer": true - } - ], "passes": [ { "effect": "xbr/xbr-lv2-fast", @@ -43,14 +36,6 @@ "input": [ { "sampler": "decal", "texture": "screen" } ], - "output": "internal" - }, - { - "effect": "misc/blit", - "name": "Upscale", - "input": [ - { "sampler": "s_tex", "target": "internal" } - ], "output": "output" } ] diff --git a/bgfx/chains/xbr/xbr-lv2-noblend.json b/bgfx/chains/xbr/xbr-lv2-noblend.json index 6d8a70d9351..6469df993c5 100644 --- a/bgfx/chains/xbr/xbr-lv2-noblend.json +++ b/bgfx/chains/xbr/xbr-lv2-noblend.json @@ -29,13 +29,6 @@ { "name": "xBR-lv2 No Blend", "author": "Hyllian", - "targets": [ - { - "name": "internal", - "mode": "guest", - "doublebuffer": true - } - ], "passes": [ { "effect": "xbr/xbr-lv2-noblend", @@ -43,14 +36,6 @@ "input": [ { "sampler": "decal", "texture": "screen" } ], - "output": "internal" - }, - { - "effect": "misc/blit", - "name": "Upscale", - "input": [ - { "sampler": "s_tex", "target": "internal" } - ], "output": "output" } ] diff --git a/bgfx/chains/xbr/xbr-lv2.json b/bgfx/chains/xbr/xbr-lv2.json index 0b821dd82a3..fbcda45917d 100644 --- a/bgfx/chains/xbr/xbr-lv2.json +++ b/bgfx/chains/xbr/xbr-lv2.json @@ -29,13 +29,6 @@ { "name": "xBR-lv2", "author": "Hyllian", - "targets": [ - { - "name": "internal", - "mode": "guest", - "doublebuffer": true - } - ], "passes": [ { "effect": "xbr/xbr-lv2", @@ -43,14 +36,6 @@ "input": [ { "sampler": "decal", "texture": "screen" } ], - "output": "internal" - }, - { - "effect": "misc/blit", - "name": "Upscale", - "input": [ - { "sampler": "s_tex", "target": "internal" } - ], "output": "output" } ] diff --git a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-3d.bin b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-3d.bin index d8e18eed1ec..60cd601bb67 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-3d.bin and b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-fast.bin b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-fast.bin index c7ba1220aa5..81e60bd278b 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-fast.bin and b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-fast.bin differ diff --git a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-noblend.bin b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-noblend.bin index 3b72deb8782..aba34b863c8 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-noblend.bin and b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2-noblend.bin differ diff --git a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2.bin b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2.bin index b288f8a7d84..eb0889524ef 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2.bin and b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv2.bin differ diff --git a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3-noblend.bin b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3-noblend.bin index 3b4f0db46a3..d4bc94a4e7a 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3-noblend.bin and b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3-noblend.bin differ diff --git a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3.bin b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3.bin index e2cebba1f67..1d89ff9dc03 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3.bin and b/bgfx/shaders/dx11/chains/xbr/fs_xbr-lv3.bin differ diff --git a/bgfx/shaders/dx11/chains/xbr/vs_xbr-lv2-3d.bin b/bgfx/shaders/dx11/chains/xbr/vs_xbr-lv2-3d.bin index 324107e89b1..fcd71edc655 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/vs_xbr-lv2-3d.bin and b/bgfx/shaders/dx11/chains/xbr/vs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-3d.bin b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-3d.bin index 28cf2738913..22aa4d95861 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-3d.bin and b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-fast.bin b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-fast.bin index 3f04275f5ba..5eb4c7d62c1 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-fast.bin and b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-fast.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-noblend.bin b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-noblend.bin index 9cbbdd173c7..a66673f03f5 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-noblend.bin and b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2-noblend.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2.bin b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2.bin index 8274e8aa4d8..f2dbf48200a 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2.bin and b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv2.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3-noblend.bin b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3-noblend.bin index 6a3de661a08..259a40612a3 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3-noblend.bin and b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3-noblend.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3.bin b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3.bin index a6c9393e207..6bbad16b288 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3.bin and b/bgfx/shaders/dx9/chains/xbr/fs_xbr-lv3.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/vs_xbr-lv2-3d.bin b/bgfx/shaders/dx9/chains/xbr/vs_xbr-lv2-3d.bin index 2f3ac8db667..5bccc4d8c98 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/vs_xbr-lv2-3d.bin and b/bgfx/shaders/dx9/chains/xbr/vs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-3d.bin b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-3d.bin index 9643a265714..d3e1b180b27 100644 Binary files a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-3d.bin and b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-fast.bin b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-fast.bin index fb0ee7104e3..840d103194b 100644 Binary files a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-fast.bin and b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-fast.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-noblend.bin b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-noblend.bin index b4875edd7c6..457fe5a3dbf 100644 Binary files a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-noblend.bin and b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2-noblend.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2.bin b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2.bin index c5dcd103244..b5ab071e866 100644 Binary files a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2.bin and b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv2.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv3-noblend.bin b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv3-noblend.bin index 8ef2d000e2b..be749d0b162 100644 Binary files a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv3-noblend.bin and b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv3-noblend.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv3.bin b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv3.bin index e2d807898a8..a9a218e5798 100644 Binary files a/bgfx/shaders/essl/chains/xbr/fs_xbr-lv3.bin and b/bgfx/shaders/essl/chains/xbr/fs_xbr-lv3.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/vs_xbr-lv2-3d.bin b/bgfx/shaders/essl/chains/xbr/vs_xbr-lv2-3d.bin index 185547625c4..26b10137f15 100644 Binary files a/bgfx/shaders/essl/chains/xbr/vs_xbr-lv2-3d.bin and b/bgfx/shaders/essl/chains/xbr/vs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-3d.bin b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-3d.bin index 5e23d658855..4eb973425fe 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-3d.bin and b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-fast.bin b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-fast.bin index a7b48e65fc8..c42afe7d9ce 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-fast.bin and b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-fast.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-noblend.bin b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-noblend.bin index f404bb3847c..93e048d5f0e 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-noblend.bin and b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2-noblend.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2.bin b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2.bin index b1e84120d4d..57ad240a61f 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2.bin and b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv2.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3-noblend.bin b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3-noblend.bin index f8cbc73f326..0899e9faaa8 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3-noblend.bin and b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3-noblend.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3.bin b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3.bin index 9eeb127cdf9..1b890059248 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3.bin and b/bgfx/shaders/glsl/chains/xbr/fs_xbr-lv3.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/vs_xbr-lv2-3d.bin b/bgfx/shaders/glsl/chains/xbr/vs_xbr-lv2-3d.bin index d0293824b94..c771634e8be 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/vs_xbr-lv2-3d.bin and b/bgfx/shaders/glsl/chains/xbr/vs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-3d.bin b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-3d.bin index ce2f9f62d51..c7618a2d96f 100644 Binary files a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-3d.bin and b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-3d.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-fast.bin b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-fast.bin index 12f2ae31da0..4883fe8edf4 100644 Binary files a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-fast.bin and b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-fast.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-noblend.bin b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-noblend.bin index cf8f4857cc7..f3617dd9645 100644 Binary files a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-noblend.bin and b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2-noblend.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2.bin b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2.bin index 930b10120a9..c01d49c6c54 100644 Binary files a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2.bin and b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv2.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv3-noblend.bin b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv3-noblend.bin index 7df071c1379..cd0fde65e4e 100644 Binary files a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv3-noblend.bin and b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv3-noblend.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv3.bin b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv3.bin index 3be8a6e265a..53a3c4a0d2e 100644 Binary files a/bgfx/shaders/metal/chains/xbr/fs_xbr-lv3.bin and b/bgfx/shaders/metal/chains/xbr/fs_xbr-lv3.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/vs_xbr-lv2-3d.bin b/bgfx/shaders/metal/chains/xbr/vs_xbr-lv2-3d.bin index c4bc3b40c4d..ac2d2c9b499 100644 Binary files a/bgfx/shaders/metal/chains/xbr/vs_xbr-lv2-3d.bin and b/bgfx/shaders/metal/chains/xbr/vs_xbr-lv2-3d.bin differ -- cgit v1.2.3