From 825d575195d59f02e9685b33ea3cbbe32e405304 Mon Sep 17 00:00:00 2001 From: "therealmogminer@gmail.com" Date: Mon, 21 Mar 2016 03:43:02 +0100 Subject: Fix lots of issues with bgfx --- bgfx/chains/default.json | 8 ++------ bgfx/chains/hlsl.json | 14 ++------------ bgfx/chains/unfiltered.json | 8 ++------ bgfx/shaders/dx11/fs_blit.bin | Bin 40856 -> 40856 bytes bgfx/shaders/dx11/fs_color.bin | Bin 43257 -> 43257 bytes bgfx/shaders/dx11/fs_deconverge.bin | Bin 41060 -> 41060 bytes bgfx/shaders/dx11/fs_defocus.bin | Bin 45804 -> 45804 bytes bgfx/shaders/dx11/fs_distortion.bin | Bin 56045 -> 56045 bytes bgfx/shaders/dx11/fs_gui.bin | Bin 40856 -> 40856 bytes bgfx/shaders/dx11/fs_ntsc_decode.bin | Bin 58919 -> 58919 bytes bgfx/shaders/dx11/fs_ntsc_encode.bin | Bin 48331 -> 48331 bytes bgfx/shaders/dx11/fs_phosphor.bin | Bin 41094 -> 41094 bytes bgfx/shaders/dx11/fs_post.bin | Bin 55640 -> 55640 bytes bgfx/shaders/dx11/fs_screen.bin | Bin 40856 -> 40856 bytes bgfx/shaders/dx11/vs_blit.bin | Bin 38987 -> 38987 bytes bgfx/shaders/dx11/vs_color.bin | Bin 38987 -> 38987 bytes bgfx/shaders/dx11/vs_deconverge.bin | Bin 43788 -> 43788 bytes bgfx/shaders/dx11/vs_defocus.bin | Bin 38987 -> 38987 bytes bgfx/shaders/dx11/vs_distortion.bin | Bin 38987 -> 38987 bytes bgfx/shaders/dx11/vs_gui.bin | Bin 38987 -> 38987 bytes bgfx/shaders/dx11/vs_ntsc_decode.bin | Bin 38987 -> 38987 bytes bgfx/shaders/dx11/vs_ntsc_encode.bin | Bin 38987 -> 38987 bytes bgfx/shaders/dx11/vs_phosphor.bin | Bin 38987 -> 38987 bytes bgfx/shaders/dx11/vs_post.bin | Bin 41216 -> 41216 bytes bgfx/shaders/dx11/vs_screen.bin | Bin 38987 -> 38987 bytes 25 files changed, 6 insertions(+), 24 deletions(-) (limited to 'bgfx') diff --git a/bgfx/chains/default.json b/bgfx/chains/default.json index fca46a0159e..f620ce93855 100644 --- a/bgfx/chains/default.json +++ b/bgfx/chains/default.json @@ -4,9 +4,6 @@ { "name": "temp", "mode": "guest", "bilinear": true - }, - { "name": "screen", - "mode": "native" } ], "passes": [ @@ -22,8 +19,7 @@ "input": [ { "sampler": "s_tex", "texture": "temp" } ], - "output": "screen" + "output": "output" } - ], - "output": "screen" + ] } \ No newline at end of file diff --git a/bgfx/chains/hlsl.json b/bgfx/chains/hlsl.json index 784a51c011b..a788235aa38 100644 --- a/bgfx/chains/hlsl.json +++ b/bgfx/chains/hlsl.json @@ -71,15 +71,6 @@ "mode": "guest", "prescale": true, "doublebuffer": true - }, - { "name": "previous", - "mode": "guest", - "prescale": true, - "doublebuffer": true - }, - { "name": "screen", - "mode": "native", - "doublebuffer": true } ], "passes": [ @@ -307,8 +298,7 @@ "input": [ { "sampler": "s_tex", "texture": "internal" } ], - "output": "screen" + "output": "output" } - ], - "output": "screen" + ] } \ No newline at end of file diff --git a/bgfx/chains/unfiltered.json b/bgfx/chains/unfiltered.json index 63eed75a575..f93eed2c722 100644 --- a/bgfx/chains/unfiltered.json +++ b/bgfx/chains/unfiltered.json @@ -4,9 +4,6 @@ { "name": "temp", "mode": "guest", "bilinear": false - }, - { "name": "screen", - "mode": "native" } ], "passes": [ @@ -22,8 +19,7 @@ "input": [ { "sampler": "s_tex", "texture": "temp" } ], - "output": "screen" + "output": "output" } - ], - "output": "screen" + ] } \ No newline at end of file diff --git a/bgfx/shaders/dx11/fs_blit.bin b/bgfx/shaders/dx11/fs_blit.bin index ffaaa190950..9b82df8d3bc 100644 Binary files a/bgfx/shaders/dx11/fs_blit.bin and b/bgfx/shaders/dx11/fs_blit.bin differ diff --git a/bgfx/shaders/dx11/fs_color.bin b/bgfx/shaders/dx11/fs_color.bin index 5cbf93eb345..388dd403690 100644 Binary files a/bgfx/shaders/dx11/fs_color.bin and b/bgfx/shaders/dx11/fs_color.bin differ diff --git a/bgfx/shaders/dx11/fs_deconverge.bin b/bgfx/shaders/dx11/fs_deconverge.bin index cfd2f01541b..7f114eb40de 100644 Binary files a/bgfx/shaders/dx11/fs_deconverge.bin and b/bgfx/shaders/dx11/fs_deconverge.bin differ diff --git a/bgfx/shaders/dx11/fs_defocus.bin b/bgfx/shaders/dx11/fs_defocus.bin index 27bae0bf11a..2b62ecfea50 100644 Binary files a/bgfx/shaders/dx11/fs_defocus.bin and b/bgfx/shaders/dx11/fs_defocus.bin differ diff --git a/bgfx/shaders/dx11/fs_distortion.bin b/bgfx/shaders/dx11/fs_distortion.bin index 77295d7a4b7..8bb9b1d8de9 100644 Binary files a/bgfx/shaders/dx11/fs_distortion.bin and b/bgfx/shaders/dx11/fs_distortion.bin differ diff --git a/bgfx/shaders/dx11/fs_gui.bin b/bgfx/shaders/dx11/fs_gui.bin index 5f452bdc4f2..7091eac73e3 100644 Binary files a/bgfx/shaders/dx11/fs_gui.bin and b/bgfx/shaders/dx11/fs_gui.bin differ diff --git a/bgfx/shaders/dx11/fs_ntsc_decode.bin b/bgfx/shaders/dx11/fs_ntsc_decode.bin index 327d86d1fce..8ba3903ec0a 100644 Binary files a/bgfx/shaders/dx11/fs_ntsc_decode.bin and b/bgfx/shaders/dx11/fs_ntsc_decode.bin differ diff --git a/bgfx/shaders/dx11/fs_ntsc_encode.bin b/bgfx/shaders/dx11/fs_ntsc_encode.bin index 05f2161a539..0b9a2ef1c2d 100644 Binary files a/bgfx/shaders/dx11/fs_ntsc_encode.bin and b/bgfx/shaders/dx11/fs_ntsc_encode.bin differ diff --git a/bgfx/shaders/dx11/fs_phosphor.bin b/bgfx/shaders/dx11/fs_phosphor.bin index 1a9430af3ad..4e9463b9e43 100644 Binary files a/bgfx/shaders/dx11/fs_phosphor.bin and b/bgfx/shaders/dx11/fs_phosphor.bin differ diff --git a/bgfx/shaders/dx11/fs_post.bin b/bgfx/shaders/dx11/fs_post.bin index b0f7026a48b..2966d31caed 100644 Binary files a/bgfx/shaders/dx11/fs_post.bin and b/bgfx/shaders/dx11/fs_post.bin differ diff --git a/bgfx/shaders/dx11/fs_screen.bin b/bgfx/shaders/dx11/fs_screen.bin index e1984860d6d..77db0e11cdf 100644 Binary files a/bgfx/shaders/dx11/fs_screen.bin and b/bgfx/shaders/dx11/fs_screen.bin differ diff --git a/bgfx/shaders/dx11/vs_blit.bin b/bgfx/shaders/dx11/vs_blit.bin index 5a91e418e0e..921983524a6 100644 Binary files a/bgfx/shaders/dx11/vs_blit.bin and b/bgfx/shaders/dx11/vs_blit.bin differ diff --git a/bgfx/shaders/dx11/vs_color.bin b/bgfx/shaders/dx11/vs_color.bin index 1abc2ad4ee4..e8537348c73 100644 Binary files a/bgfx/shaders/dx11/vs_color.bin and b/bgfx/shaders/dx11/vs_color.bin differ diff --git a/bgfx/shaders/dx11/vs_deconverge.bin b/bgfx/shaders/dx11/vs_deconverge.bin index e23c0d8a2c4..04b7f26d457 100644 Binary files a/bgfx/shaders/dx11/vs_deconverge.bin and b/bgfx/shaders/dx11/vs_deconverge.bin differ diff --git a/bgfx/shaders/dx11/vs_defocus.bin b/bgfx/shaders/dx11/vs_defocus.bin index 36da8e24752..48e32ee5d8c 100644 Binary files a/bgfx/shaders/dx11/vs_defocus.bin and b/bgfx/shaders/dx11/vs_defocus.bin differ diff --git a/bgfx/shaders/dx11/vs_distortion.bin b/bgfx/shaders/dx11/vs_distortion.bin index 4f021030a66..d56ecb58e4f 100644 Binary files a/bgfx/shaders/dx11/vs_distortion.bin and b/bgfx/shaders/dx11/vs_distortion.bin differ diff --git a/bgfx/shaders/dx11/vs_gui.bin b/bgfx/shaders/dx11/vs_gui.bin index f1707c28ed0..a534317dfb9 100644 Binary files a/bgfx/shaders/dx11/vs_gui.bin and b/bgfx/shaders/dx11/vs_gui.bin differ diff --git a/bgfx/shaders/dx11/vs_ntsc_decode.bin b/bgfx/shaders/dx11/vs_ntsc_decode.bin index 62adb591763..1d83e3d9ea4 100644 Binary files a/bgfx/shaders/dx11/vs_ntsc_decode.bin and b/bgfx/shaders/dx11/vs_ntsc_decode.bin differ diff --git a/bgfx/shaders/dx11/vs_ntsc_encode.bin b/bgfx/shaders/dx11/vs_ntsc_encode.bin index c9695a27aea..d58e84749dc 100644 Binary files a/bgfx/shaders/dx11/vs_ntsc_encode.bin and b/bgfx/shaders/dx11/vs_ntsc_encode.bin differ diff --git a/bgfx/shaders/dx11/vs_phosphor.bin b/bgfx/shaders/dx11/vs_phosphor.bin index 18d3a86a8b4..72def3ab605 100644 Binary files a/bgfx/shaders/dx11/vs_phosphor.bin and b/bgfx/shaders/dx11/vs_phosphor.bin differ diff --git a/bgfx/shaders/dx11/vs_post.bin b/bgfx/shaders/dx11/vs_post.bin index fa5c59c6818..3495e27a797 100644 Binary files a/bgfx/shaders/dx11/vs_post.bin and b/bgfx/shaders/dx11/vs_post.bin differ diff --git a/bgfx/shaders/dx11/vs_screen.bin b/bgfx/shaders/dx11/vs_screen.bin index 96dc86dc5f0..320f9d80e71 100644 Binary files a/bgfx/shaders/dx11/vs_screen.bin and b/bgfx/shaders/dx11/vs_screen.bin differ -- cgit v1.2.3