summaryrefslogtreecommitdiffstats
path: root/bgfx
diff options
context:
space:
mode:
author Jezze <jezze@gmx.net>2016-10-22 22:55:32 +0200
committer Jezze <jezze@gmx.net>2016-10-22 22:56:16 +0200
commitd9ae40b9feff3d3de30cb27af5be672fc950888b (patch)
tree9025a8e595ea8121ddb451b0c42e2e52b631de36 /bgfx
parentef16086fea92b1cbb767077535bf469b518cb8c0 (diff)
Reduced defocus effect to one pass (HLSL/BGFX)
- removed second defocus pass - limited defocus stength to a maximum of 2.0
Diffstat (limited to 'bgfx')
-rw-r--r--bgfx/chains/hlsl.json18
-rw-r--r--bgfx/shaders/dx11/chains/hlsl/fs_defocus.binbin1330 -> 1292 bytes
-rw-r--r--bgfx/shaders/dx9/chains/hlsl/fs_defocus.binbin867 -> 789 bytes
-rw-r--r--bgfx/shaders/gles/chains/hlsl/fs_defocus.binbin1167 -> 1135 bytes
-rw-r--r--bgfx/shaders/glsl/chains/hlsl/fs_defocus.binbin1122 -> 1096 bytes
-rw-r--r--bgfx/shaders/metal/chains/hlsl/fs_defocus.binbin2355 -> 2346 bytes
6 files changed, 2 insertions, 16 deletions
diff --git a/bgfx/chains/hlsl.json b/bgfx/chains/hlsl.json
index ea94200dfc3..a3499dc7283 100644
--- a/bgfx/chains/hlsl.json
+++ b/bgfx/chains/hlsl.json
@@ -84,7 +84,7 @@
{ "type": "vec2", "name": "radial_converge_green", "text": "Green Radial Convergence, ", "default": [ 0.0, 0.0 ], "max": [ 10.0, 10.0 ], "min": [ -10.0, -10.0 ], "step": 0.1, "format": "%2.1f", "screen": "raster" },
{ "type": "vec2", "name": "radial_converge_blue", "text": "Blue Radial Convergence, ", "default": [ 0.0, 0.0 ], "max": [ 10.0, 10.0 ], "min": [ -10.0, -10.0 ], "step": 0.1, "format": "%2.1f", "screen": "raster" },
- { "type": "vec2", "name": "defocus", "text": "Defocus, ", "default": [ 0.5, 0.5 ], "max": [ 10.0, 10.0 ], "min": [ 0.0, 0.0 ], "step": 0.1, "format": "%2.1f", "screen": "crt" },
+ { "type": "vec2", "name": "defocus", "text": "Defocus, ", "default": [ 0.5, 0.5 ], "max": [ 2.0, 2.0 ], "min": [ 0.0, 0.0 ], "step": 0.1, "format": "%1.1f", "screen": "crt" },
{ "type": "color", "name": "phosphor", "text": "Phosphor Persistence, ", "default": [ 0.45, 0.45, 0.45 ], "max": [ 1.00, 1.00, 1.00 ], "min": [ 0.00, 0.00, 0.00 ], "step": 0.01, "format": "%1.2f", "screen": "crt" },
@@ -391,21 +391,7 @@
"output": "internal"
},
{ "effect": "hlsl/defocus",
- "name": "Defocus Pass 1",
- "disablewhen": [
- { "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
- { "type": "slider", "condition": "equal", "combine": "or", "name": "defocus", "value": [ 0, 0 ] }
- ],
- "uniforms": [
- { "uniform": "u_defocus", "slider": "defocus" }
- ],
- "input": [
- { "sampler": "s_tex", "target": "internal" }
- ],
- "output": "internal"
- },
- { "effect": "hlsl/defocus",
- "name": "Defocus Pass 2",
+ "name": "Defocus Pass",
"disablewhen": [
{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
{ "type": "slider", "condition": "equal", "combine": "or", "name": "defocus", "value": [ 0, 0 ] }
diff --git a/bgfx/shaders/dx11/chains/hlsl/fs_defocus.bin b/bgfx/shaders/dx11/chains/hlsl/fs_defocus.bin
index 1636abdef10..7459dabdcac 100644
--- a/bgfx/shaders/dx11/chains/hlsl/fs_defocus.bin
+++ b/bgfx/shaders/dx11/chains/hlsl/fs_defocus.bin
Binary files differ
diff --git a/bgfx/shaders/dx9/chains/hlsl/fs_defocus.bin b/bgfx/shaders/dx9/chains/hlsl/fs_defocus.bin
index 12ed2624d0b..c14f1574af3 100644
--- a/bgfx/shaders/dx9/chains/hlsl/fs_defocus.bin
+++ b/bgfx/shaders/dx9/chains/hlsl/fs_defocus.bin
Binary files differ
diff --git a/bgfx/shaders/gles/chains/hlsl/fs_defocus.bin b/bgfx/shaders/gles/chains/hlsl/fs_defocus.bin
index 5d29797339f..ce6684682f7 100644
--- a/bgfx/shaders/gles/chains/hlsl/fs_defocus.bin
+++ b/bgfx/shaders/gles/chains/hlsl/fs_defocus.bin
Binary files differ
diff --git a/bgfx/shaders/glsl/chains/hlsl/fs_defocus.bin b/bgfx/shaders/glsl/chains/hlsl/fs_defocus.bin
index 27765612664..238e85969c2 100644
--- a/bgfx/shaders/glsl/chains/hlsl/fs_defocus.bin
+++ b/bgfx/shaders/glsl/chains/hlsl/fs_defocus.bin
Binary files differ
diff --git a/bgfx/shaders/metal/chains/hlsl/fs_defocus.bin b/bgfx/shaders/metal/chains/hlsl/fs_defocus.bin
index ab14379b016..90bf785e554 100644
--- a/bgfx/shaders/metal/chains/hlsl/fs_defocus.bin
+++ b/bgfx/shaders/metal/chains/hlsl/fs_defocus.bin
Binary files differ