diff options
| author | 2016-03-16 18:52:07 +0100 | |
|---|---|---|
| committer | 2016-03-16 18:52:07 +0100 | |
| commit | 493cf7289be81f15a975d60b48e58b0132854323 (patch) | |
| tree | ce0312c41258ad27182bffada0faacb0b5a9d3ac /bgfx/effects | |
| parent | e1883e3090510d943af54ae24cee3a637e4d72a5 (diff) | |
More bgfx HLSL fixups, nw
Diffstat (limited to 'bgfx/effects')
| -rw-r--r-- | bgfx/effects/blit.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/bloom_scale.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/color.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/deconverge.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/defocus.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/distortion.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/ntsc_decode.json | 16 | ||||
| -rw-r--r-- | bgfx/effects/ntsc_encode.json | 22 | ||||
| -rw-r--r-- | bgfx/effects/phosphor.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/post.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/ratios.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/screen_opaque.json | 8 | ||||
| -rw-r--r-- | bgfx/effects/tint.json | 8 |
13 files changed, 63 insertions, 63 deletions
diff --git a/bgfx/effects/blit.json b/bgfx/effects/blit.json index 2d2d281df62..3954b4d0b74 100644 --- a/bgfx/effects/blit.json +++ b/bgfx/effects/blit.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/bloom_scale.json b/bgfx/effects/bloom_scale.json index 0dfcdcee712..5ba081a5a19 100644 --- a/bgfx/effects/bloom_scale.json +++ b/bgfx/effects/bloom_scale.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/color.json b/bgfx/effects/color.json index 8e1ad25e167..41e38714e9c 100644 --- a/bgfx/effects/color.json +++ b/bgfx/effects/color.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/deconverge.json b/bgfx/effects/deconverge.json index 71a0c6e3cb8..69d67632497 100644 --- a/bgfx/effects/deconverge.json +++ b/bgfx/effects/deconverge.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/defocus.json b/bgfx/effects/defocus.json index bfbba4b388a..ddf8abf1b62 100644 --- a/bgfx/effects/defocus.json +++ b/bgfx/effects/defocus.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/distortion.json b/bgfx/effects/distortion.json index 785a1e8ee4d..e8fcb4722c7 100644 --- a/bgfx/effects/distortion.json +++ b/bgfx/effects/distortion.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/ntsc_decode.json b/bgfx/effects/ntsc_decode.json index ba57ae65f26..89e8288f8b2 100644 --- a/bgfx/effects/ntsc_decode.json +++ b/bgfx/effects/ntsc_decode.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" @@ -19,10 +19,10 @@ "uniforms": [ { "name": "DiffuseSampler", "type": "int", "values": [ 1.0 ] }, { "name": "u_source_dims", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] }, - { "name": "u_a_value", "type": "vec4", "values": [ 0.5, 0.0, 0.0, 0.0 ] }, - { "name": "u_b_value", "type": "vec4", "values": [ 0.5, 0.0, 0.0, 0.0 ] }, - { "name": "u_cc_value", "type": "vec4", "values": [ 3.5795454, 0.0, 0.0, 0.0 ] }, - { "name": "u_o_value", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, + { "name": "u_a_value", "type": "vec4", "values": [ 0.5, 0.5, 0.5, 0.5 ] }, + { "name": "u_b_value", "type": "vec4", "values": [ 0.5, 0.5, 0.5, 0.5 ] }, + { "name": "u_cc_value", "type": "vec4", "values": [ 3.5795454, 3.5795454, 3.5795454, 3.5795454 ] }, + { "name": "u_o_value", "type": "vec4", "values": [ 1.570796325, 1.570796325, 1.570796325, 1.570796325 ] }, { "name": "u_scan_time", "type": "vec4", "values": [ 52.6, 0.0, 0.0, 0.0 ] }, { "name": "u_notch_width", "type": "vec4", "values": [ 2.0, 0.0, 0.0, 0.0 ] }, { "name": "u_y_freq_response", "type": "vec4", "values": [ 6.0, 0.0, 0.0, 0.0 ] }, diff --git a/bgfx/effects/ntsc_encode.json b/bgfx/effects/ntsc_encode.json index 4d622b0dc10..9cee95af3c3 100644 --- a/bgfx/effects/ntsc_encode.json +++ b/bgfx/effects/ntsc_encode.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" @@ -18,13 +18,13 @@ "fragment": "fs_ntsc_encode", "uniforms": [ { "name": "DiffuseSampler", "type": "int", "values": [ 1.0 ] }, - { "name": "u_source_dims", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] }, - { "name": "u_a_value", "type": "vec4", "values": [ 0.5, 0.0, 0.0, 0.0 ] }, - { "name": "u_b_value", "type": "vec4", "values": [ 0.5, 0.0, 0.0, 0.0 ] }, - { "name": "u_cc_value", "type": "vec4", "values": [ 3.5795454, 0.0, 0.0, 0.0 ] }, - { "name": "u_p_value", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, + { "name": "u_source_dims", "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] }, + { "name": "u_a_value", "type": "vec4", "values": [ 0.5, 0.0, 0.0, 0.0 ] }, + { "name": "u_b_value", "type": "vec4", "values": [ 0.5, 0.0, 0.0, 0.0 ] }, + { "name": "u_cc_value", "type": "vec4", "values": [ 0.5, 0.0, 0.0, 0.0 ] }, + { "name": "u_p_value", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }, { "name": "u_scan_time", "type": "vec4", "values": [ 52.6, 0.0, 0.0, 0.0 ] }, - { "name": "u_jitter_amount", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, - { "name": "u_jitter_offset", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] } + { "name": "u_jitter_amount", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }, + { "name": "u_jitter_offset", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] } ] }
\ No newline at end of file diff --git a/bgfx/effects/phosphor.json b/bgfx/effects/phosphor.json index 0efbad997de..68038e3e99b 100644 --- a/bgfx/effects/phosphor.json +++ b/bgfx/effects/phosphor.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/post.json b/bgfx/effects/post.json index 3afcc66b7ef..f73e2a0be7c 100644 --- a/bgfx/effects/post.json +++ b/bgfx/effects/post.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/ratios.json b/bgfx/effects/ratios.json index 0949172b0c9..7b8af5c1875 100644 --- a/bgfx/effects/ratios.json +++ b/bgfx/effects/ratios.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" diff --git a/bgfx/effects/screen_opaque.json b/bgfx/effects/screen_opaque.json index f03f1943404..121439837ab 100644 --- a/bgfx/effects/screen_opaque.json +++ b/bgfx/effects/screen_opaque.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "1", - "dstColor": "0", - "srcAlpha": "1", - "dstAlpha": "0" + "srcColor": "srcAlpha", + "dstColor": "1-srcAlpha", + "srcAlpha": "srcAlpha", + "dstAlpha": "1-srcAlpha" }, "depth": { "function": "always" diff --git a/bgfx/effects/tint.json b/bgfx/effects/tint.json index 7dfe9c8d709..9b022ebe993 100644 --- a/bgfx/effects/tint.json +++ b/bgfx/effects/tint.json @@ -1,10 +1,10 @@ { "blend": { "equation": "add", - "srcColor": "srcAlpha", - "dstColor": "1-srcAlpha", - "srcAlpha": "srcAlpha", - "dstAlpha": "1-srcAlpha" + "srcColor": "1", + "dstColor": "0", + "srcAlpha": "1", + "dstAlpha": "0" }, "depth": { "function": "always" |
