Merge bgfx_shader into master, nw

3rdparty/bgfx/scripts/shader.mk

@@ -25,38 +25,38 @@ all:
 else
 
 ifeq ($(TARGET), 0)
-VS_FLAGS=--platform windows -p vs_3_0 -O 3
-FS_FLAGS=--platform windows -p ps_3_0 -O 3
-SHADER_PATH=shaders/dx9
+VS_FLAGS=--platform windows -p vs_3_0 -O 3 --debug
+FS_FLAGS=--platform windows -p ps_3_0 -O 3 --debug
+SHADER_PATH=bgfx/shaders/dx9
 else
 ifeq ($(TARGET), 1)
-VS_FLAGS=--platform windows -p vs_4_0 -O 3
-FS_FLAGS=--platform windows -p ps_4_0 -O 3
-CS_FLAGS=--platform windows -p cs_5_0 -O 1
-SHADER_PATH=shaders/dx11
+VS_FLAGS=--platform windows -p vs_4_0 -O 3 --debug
+FS_FLAGS=--platform windows -p ps_4_0 -O 3 --debug
+CS_FLAGS=--platform windows -p cs_5_0 -O 1 --debug
+SHADER_PATH=bgfx/shaders/dx11
 else
 ifeq ($(TARGET), 2)
 VS_FLAGS=--platform nacl
 FS_FLAGS=--platform nacl
-SHADER_PATH=shaders/gles
+SHADER_PATH=bgfx/shaders/gles
 else
 ifeq ($(TARGET), 3)
 VS_FLAGS=--platform android
 FS_FLAGS=--platform android
 CS_FLAGS=--platform android
-SHADER_PATH=shaders/gles
+SHADER_PATH=bgfx/shaders/gles
 else
 ifeq ($(TARGET), 4)
 VS_FLAGS=--platform linux -p 120
 FS_FLAGS=--platform linux -p 120
 CS_FLAGS=--platform linux -p 430
-SHADER_PATH=shaders/glsl
+SHADER_PATH=bgfx/shaders/glsl
 else
 ifeq ($(TARGET), 5)
 VS_FLAGS=--platform osx -p metal
 FS_FLAGS=--platform osx -p metal
 CS_FLAGS=--platform osx -p metal
-SHADER_PATH=shaders/metal
+SHADER_PATH=bgfx/shaders/metal
 endif
 endif
 endif

3rdparty/bgfx/src/config.h

@@ -266,7 +266,7 @@
 #endif // BGFX_CONFIG_MAX_TEXTURE_SAMPLERS
 
 #ifndef BGFX_CONFIG_MAX_FRAME_BUFFERS
-#	define BGFX_CONFIG_MAX_FRAME_BUFFERS 64
+#	define BGFX_CONFIG_MAX_FRAME_BUFFERS 128
 #endif // BGFX_CONFIG_MAX_FRAME_BUFFERS
 
 #ifndef BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS

3rdparty/bgfx/tools/bin/windows/.gitignore

@@ -0,0 +1 @@
+*

bgfx/chains/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2016, Ryan Holtz and MAME Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of bsd3 nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bgfx/chains/README.md

@@ -0,0 +1,5 @@
+# **Tests** #
+
+Cointains definitions for BGFX shader chains
+
+Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) by Ryan Holtz and MAME Development Team

bgfx/chains/default.json

@@ -0,0 +1,25 @@
+{	"name": "Default Bilinear Filter",
+	"author": "Ryan Holtz",
+	"targets": [
+		{	"name": "temp",
+			"mode": "guest",
+			"bilinear": true
+		}
+	],
+	"passes": [
+		{	"effect": "blit",
+			"name": "Copy To Unstretched Texture",
+			"input": [
+				{ "sampler": "s_tex", "texture": "screen" }
+			],
+			"output": "temp"
+		},
+		{	"effect": "blit",
+			"name": "Final Upscale",
+			"input": [
+				{ "sampler": "s_tex", "texture": "temp" }
+			],
+			"output": "output"
+		}
+	]
+}

bgfx/chains/hlsl.json

@@ -0,0 +1,304 @@
+{	"name": "Classic D3D HLSL CRT Simulation",
+	"author": "Ryan Holtz & ImJezze",
+	"sliders": [
+		{ "type": "int_enum", "name": "adjustments", "text": "Enable Adjustments", "default": 0, "max": 1, "min": 0, "step": 1, "scale": 1.0, "format": "%s", "screen": "any", "strings": [ "Off", "On" ] },
+
+		{ "type": "int_enum", "name": "ntsc",            "text": "Enable NTSC",                   "default": 0,        "max": 1,        "min": 0,        "step": 1,   "scale": 1.0,       "format": "%s",    "screen": "any", "strings": [ "Off", "On" ] },
+		{ "type": "float",    "name": "a_value",         "text": "NTSC A Value",                  "default": 50,       "max": 100,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",    "name": "b_value",         "text": "NTSC B Value",                  "default": 50,       "max": 100,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",    "name": "cc_value",        "text": "NTSC Color Carrier (Hz)",       "default": 35795454, "max": 36795454, "min": 34795454, "step": 100, "scale": 0.0000001, "format": "%1.7f", "screen": "raster" },
+		{ "type": "float",    "name": "p_value",         "text": "NTSC Phase Offset",             "default": 100,      "max": 200,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",    "name": "scan_time",       "text": "NTSC Scanline Duration (uSec)", "default": 526,      "max": 1500,     "min": 1,        "step": 1,   "scale": 0.1,       "format": "%3.1f", "screen": "raster" },
+		{ "type": "float",    "name": "notch_width",     "text": "NTSC Color Notch Filter Width", "default": 100,      "max": 400,      "min": 1,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",    "name": "y_freq_response", "text": "NTSC Y Signal Bandwidth (Hz)",  "default": 600,      "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
+		{ "type": "float",    "name": "i_freq_response", "text": "NTSC I Signal Bandwidth (Hz)",  "default": 120,      "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
+		{ "type": "float",    "name": "q_freq_response", "text": "NTSC Q Signal Bandwidth (Hz)",  "default": 60,       "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
+		{ "type": "float",    "name": "jitter_offset",   "text": "NTSC Frame Jitter Offset",      "default": 0,        "max": 200,      "min": 1,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+
+		{ "type": "color", "name": "red_ratios", "text": "Red Output from ",   "default": [ 100,   0,   0 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" },
+		{ "type": "color", "name": "grn_ratios", "text": "Green Output from ", "default": [   0, 100,   0 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" },
+		{ "type": "color", "name": "blu_ratios", "text": "Blue Output from ",  "default": [   0,   0, 100 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" },
+		{ "type": "color", "name": "offset",     "text": "Signal Offset, ",    "default": [   0,   0,   0 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" },
+		{ "type": "color", "name": "scale",      "text": "Signal Scale, ",     "default": [  95,  95,  95 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" },
+		{ "type": "float", "name": "saturation", "text": "Color Saturation",   "default": 150,               "max": 400,               "min": 0,           "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" },
+
+		{ "type": "vec2", "name": "converge_red",          "text": "Red Convergence, ",   "default": [ 5, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
+		{ "type": "vec2", "name": "converge_green",        "text": "Green Convergence, ", "default": [ 0, 5 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
+		{ "type": "vec2", "name": "converge_blue",         "text": "Blue Convergence, ",  "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
+		
+		{ "type": "vec2", "name": "radial_converge_red",   "text": "Red Radial Convergence, ",   "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
+		{ "type": "vec2", "name": "radial_converge_green", "text": "Green Radial Convergence, ", "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
+		{ "type": "vec2", "name": "radial_converge_blue",  "text": "Blue Radial Convergence, ",  "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
+
+		{ "type": "vec2", "name": "defocus", "text": "Defocus, ",  "default": [ 5, 5 ], "max": [ 500, 500 ], "min": [ 0, 0 ], "step": 1, "scale": 0.1, "format": "%2.1f", "screen": "crt" },
+
+		{ "type": "color", "name": "phosphor", "text": "Phosphor Persistence, ",  "default": [ 45, 45, 45 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+
+		{ "type": "float",    "name": "scanline_alpha",         "text": "Scanline Amount",            "default": 100,               "max": 100,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",    "name": "scanline_scale",         "text": "Overall Scanline Scale",     "default": 100,               "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",    "name": "scanline_bright_scale",  "text": "Scanline Brightness Scale",  "default": 200,               "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",    "name": "scanline_bright_offset", "text": "Scanline Brightness Offset", "default": 0,                 "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",    "name": "scanline_jitter_amount", "text": "Scanline Jitter Amount",     "default": 0,                 "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",    "name": "scanline_height",        "text": "Individual Scanline Scale",  "default": 100,               "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",    "name": "shadow_alpha",           "text": "Shadow Mask Amount",         "default": 0,                 "max": 100,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "vec2",     "name": "shadow_uv_size",         "text": "Shadow Mask UV Size ",       "default": [ 250, 333 ],      "max": [ 1000, 1000 ],    "min": [ 0, 0 ],    "step": 1, "scale": 0.001,      "format": "%1.4f", "screen": "crt" },
+		{ "type": "vec2",     "name": "shadow_uv_offset",       "text": "Shadow Mask UV Offset ",     "default": [   0,   0 ],      "max": [ 1000, 1000 ],    "min": [ 0, 0 ],    "step": 1, "scale": 0.001,      "format": "%1.4f", "screen": "crt" },
+		{ "type": "int_enum", "name": "shadow_tile_mode",       "text": "Shadow Mask Tile Mode",      "default": 0,                 "max": 1,                 "min": 0,           "step": 1, "scale": 1.0,        "format": "%s",    "screen": "crt", "strings": [ "Screen", "Source" ] },
+		{ "type": "float",    "name": "humbar_alpha",           "text": "Hum Bar Amount",             "default": 5,                 "max": 100,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",    "name": "humbar_hertz_rate",      "text": "Hum Bar Frequency",          "default": 100,               "max": 10000,             "min": 0,           "step": 1, "scale": 0.00001,    "format": "%1.7f", "screen": "crt" },
+		{ "type": "color",    "name": "floor",                  "text": "Signal Floor, ",             "default": [   5,   5,   5 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "color",    "name": "power",                  "text": "Signal Exponent, ",          "default": [  80,  80,  80 ], "max": [ 400, 400, 400 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		
+		{ "type": "float", "name": "curvature",     "text": "Screen Curvature Amount", "default": 25, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "round_corner",  "text": "Rounded Corner Amount",   "default": 20, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "smooth_border", "text": "Smooth Border Amount",    "default": 5,  "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "vignetting",    "text": "Vignetting Amount",       "default": 20, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "reflection",    "text": "Reflection Amount",       "default": 30, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }
+	],
+	"parameters": [
+		{ "name": "jitter", "type": "frame", "period": 2 },
+		{ "name": "time",   "type": "time",  "limit": 0.0 }
+	],
+	"targets": [
+		{
+			"name": "guest",
+			"mode": "guest",
+			"bilinear": false,
+			"prescale": false,
+			"doublebuffer": true
+		},
+		{	"name": "internal",
+			"mode": "guest",
+			"prescale": true,
+			"doublebuffer": true
+		}
+	],
+	"passes": [
+		{	"effect": "ntsc_encode",
+			"name": "NTSC Encode",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "ntsc",        "value": 0 }
+			],
+			"uniforms": [
+				{ "uniform": "u_a_value",         "slider": "a_value" },
+				{ "uniform": "u_b_value",         "slider": "b_value" },
+				{ "uniform": "u_cc_value",        "slider": "cc_value" },
+				{ "uniform": "u_p_value",         "slider": "p_value" },
+				{ "uniform": "u_scan_time",       "slider": "scan_time" },
+				{ "uniform": "u_jitter_offset",   "slider": "jitter_offset" },
+				{ "uniform": "u_jitter_amount",   "parameter": "jitter" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "screen" }
+			],
+			"output": "guest"
+		},
+		{	"effect": "ntsc_decode",
+			"name": "NTSC Decode",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "ntsc",        "value": 0 }
+			],
+			"uniforms": [
+				{ "uniform": "u_a_value",         "slider": "a_value" },
+				{ "uniform": "u_b_value",         "slider": "b_value" },
+				{ "uniform": "u_cc_value",        "slider": "cc_value" },
+				{ "uniform": "u_scan_time",       "slider": "scan_time" },
+				{ "uniform": "u_notch_width",     "slider": "notch_width" },
+				{ "uniform": "u_y_freq_response", "slider": "y_freq_response" },
+				{ "uniform": "u_i_freq_response", "slider": "i_freq_response" },
+				{ "uniform": "u_q_freq_response", "slider": "q_freq_response" },
+				{ "uniform": "u_q_freq_response", "slider": "q_freq_response" },
+				{ "uniform": "u_jitter_offset",   "slider": "jitter_offset" },
+				{ "uniform": "u_jitter_amount",   "parameter": "jitter" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "guest" }
+			],
+			"output": "guest"
+		},
+		{	"effect": "blit",
+			"name": "NTSC Skip",
+			"disablewhen": [
+				{ "type": "slider", "condition": "notequal", "combine": "and", "name": "adjustments", "value": 0 },
+				{ "type": "slider", "condition": "notequal", "combine": "and", "name": "ntsc",        "value": 0 }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "screen" }
+			],
+			"output": "guest"
+		},
+		{	"effect": "color",
+			"name": "Color Convolution",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "name": "adjustments", "value": 0 }
+			],
+			"uniforms": [
+				{ "uniform": "u_red_ratios", "slider": "red_ratios" },
+				{ "uniform": "u_grn_ratios", "slider": "grn_ratios" },
+				{ "uniform": "u_blu_ratios", "slider": "blu_ratios" },
+				{ "uniform": "u_offset",     "slider": "offset"     },
+				{ "uniform": "u_scale",      "slider": "scale"      },
+				{ "uniform": "u_saturation", "slider": "saturation" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "guest" }
+			],
+			"output": "guest"
+		},
+ 		{	"effect": "blit",
+			"name": "Prescale",
+			"input": [
+				{ "sampler": "s_tex", "texture": "guest" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "deconverge",
+			"name": "Deconvergence",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "combine": "or",  "name": "adjustments",           "value": 0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "converge_red",          "value": [ 0, 0 ] },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "converge_green",        "value": [ 0, 0 ] },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "converge_blue",         "value": [ 0, 0 ] },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "radial_converge_red",   "value": [ 0, 0 ] },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "radial_converge_green", "value": [ 0, 0 ] },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "radial_converge_blue",  "value": [ 0, 0 ] }
+			],
+			"uniforms": [
+				{ "uniform": "u_converge_red",          "slider": "converge_red"   },
+				{ "uniform": "u_converge_green",        "slider": "converge_green" },
+				{ "uniform": "u_converge_blue",         "slider": "converge_blue"  },
+				{ "uniform": "u_radial_converge_red",   "slider": "radial_converge_red"   },
+				{ "uniform": "u_radial_converge_green", "slider": "radial_converge_green" },
+				{ "uniform": "u_radial_converge_blue",  "slider": "radial_converge_blue"  }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "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", "texture": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "defocus",
+			"name": "Defocus Pass 2",
+			"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", "texture": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "phosphor",
+			"name": "Phosphor Decay",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "phosphor",    "value": [ 0, 0, 0 ] }
+			],
+			"uniforms": [
+				{ "uniform": "u_passthrough", "value": [ 0 ] },
+				{ "uniform": "u_phosphor", "slider": "phosphor" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "internal" },
+				{ "sampler": "s_prev", "texture": "previous" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "phosphor",
+			"name": "Phosphor Store",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "phosphor",    "value": [ 0, 0, 0 ] }
+			],
+			"uniforms": [
+				{ "uniform": "u_passthrough", "value": [ 1 ] },
+				{ "uniform": "u_phosphor", "slider": "phosphor" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "internal" },
+				{ "sampler": "s_prev", "texture": "internal" }
+			],
+			"output": "previous"
+		},
+		{	"effect": "post",
+			"name": "Non-Bloom Post Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "combine": "or",  "name": "adjustments",    "value": 0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "scanline_alpha", "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "shadow_alpha",   "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "humbar_alpha",   "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "floor",          "value": [ 0, 0, 0 ] },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "power",          "value": [ 0, 0, 0 ] }
+			],
+			"uniforms": [
+				{ "uniform": "u_scanline_alpha",         "slider": "scanline_alpha" },
+				{ "uniform": "u_scanline_scale",         "slider": "scanline_scale" },
+				{ "uniform": "u_scanline_bright_scale",  "slider": "scanline_bright_scale" },
+				{ "uniform": "u_scanline_bright_offset", "slider": "scanline_bright_offset" },
+				{ "uniform": "u_shadow_alpha",           "slider": "shadow_alpha" },
+				{ "uniform": "u_shadow_uv",              "slider": "shadow_uv_size" },
+				{ "uniform": "u_shadow_uv_offset",       "slider": "shadow_uv_offset" },
+				{ "uniform": "u_shadow_tile_mode",       "slider": "shadow_tile_mode" },
+				{ "uniform": "u_humbar_alpha",           "slider": "humbar_alpha" },
+				{ "uniform": "u_humbar_hertz_rate",      "slider": "humbar_hertz_rate" },
+				{ "uniform": "u_floor",                  "slider": "floor" },
+				{ "uniform": "u_power",                  "slider": "power" },
+				{ "uniform": "u_scanline_jitter",        "slider": "scanline_jitter_amount" },
+				{ "uniform": "u_jitter_amount",          "parameter": "jitter" },
+				{ "uniform": "u_time",                   "parameter": "time" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "internal" },
+				{ "sampler": "s_shadow",  "texture": "shadow" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "distortion",
+			"name": "Distortion Pass",
+			"disablewhen": [
+				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments",    "value": 0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "curvature",     "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "round_corner",  "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "smooth_border", "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "vignetting",    "value": 0.0 },
+				{ "type": "slider", "condition": "equal", "combine": "and", "name": "reflection",    "value": 0.0 }
+			],
+			"uniforms": [
+				{ "uniform": "u_curvature",     "slider": "curvature" },
+				{ "uniform": "u_round_corner",  "slider": "round_corner" },
+				{ "uniform": "u_smooth_border", "slider": "smooth_border" },
+				{ "uniform": "u_vignetting",    "slider": "vignetting" },
+				{ "uniform": "u_reflection",    "slider": "reflection" }
+			],
+			"input": [
+				{ "sampler": "s_tex", "texture": "internal" }
+			],
+			"output": "internal"
+		},
+		{	"effect": "blit",
+			"name": "Final Downscale",
+			"input": [
+				{ "sampler": "s_tex", "texture": "internal" }
+			],
+			"output": "output"
+		}
+	]
+}

bgfx/chains/test.json

@@ -1,98 +0,0 @@
-{	"name": "Test Shader Chain",
-	"author": "Ryan Holtz",
-	"sliders": [
-		{ "type": "bool",  "name": "adjustments", "text": "Enable Adjustments", "default": false },
-		{ "type": "float", "name": "ratio_amount", "text": "Ratio Amount", "default": 0, "max": 1, "min": 0 },
-
-		{ "type": "color", "name": "red_ratios", "text": "Red Amount",   "default": [ 1, 0, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
-		{ "type": "color", "name": "grn_ratios", "text": "Green Amount", "default": [ 0, 1, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
-		{ "type": "color", "name": "blu_ratios", "text": "Blue Amount",  "default": [ 0, 0, 1 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
-		{ "type": "color", "name": "tint", "text": "Tint", "default": [ 1, 1, 1 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
-		{ "type": "color", "name": "phosphor", "text": "Phosphor Amount",  "default": [ 0, 0, 0 ], "max": [ 1, 1, 1 ], "min": [ 0, 0, 0 ] },
-		{ "type": "vec2",  "name": "shift", "text": "Frame Shift", "default": [ 0, 0 ], "max": [ 25, 25 ], "min": [ -25, -25 ] }
-	],
-	"parameters": [
-		{ "name": "alternating", "type": "frame_mask", "period": 2 }
-	],
-	"targets": [
-		{	"name": "native",
-			"screen": true
-		},
-		{	"name": "previous",
-			"screen": true,
-			"prescale": true
-		}
-	],
-	"passes": [
-		{	"effect": "ratios",
-			"name": "Matrix Pass",
-			"disable_conditions": [
-				{ "type": "slider", "name": "adjustments", "value": false },
-				{ "type": "slider", "name": "ratio_amount", "value": 0 }
-			],
-			"uniforms": [
-				{ "name": "u_ratio_amount", "slider": "ratio_amount" },
-				{ "name": "u_red_ratios", "slider": "red_ratios" },
-				{ "name": "u_grn_ratios", "slider": "grn_ratios" },
-				{ "name": "u_blu_ratios", "slider": "blu_ratios" }
-			],
-			"input": [
-				{ "sampler": "s_tex", "texture": "screen" }
-			],
-			"output": "native"
-		},
-		{	"effect": "tint",
-			"name": "Tint Pass",
-			"disable_conditions": [
-				{ "type": "slider", "name": "adjustments", "value": false }
-			],
-			"uniforms": [
-				{ "name": "u_tint", "slider": "tint" },
-				{ "name": "u_shift", "slider": "shift" }
-			],
-			"input": [
-				{ "sampler": "s_tex", "texture": "native" }
-			],
-			"output": "native"
-		},
-		{	"effect": "phosphor",
-			"name": "Phosphor Decay",
-			"disable_conditions": [
-				{ "type": "slider", "name": "adjustments", "value": false },
-				{ "type": "slider", "name": "phosphor", "value": [ 0, 0, 0 ] }
-			],
-			"uniforms": [
-				{ "name": "u_passthrough", "value": [ 0 ] },
-				{ "name": "u_phosphor", "slider": "phosphor" }
-			],
-			"input": [
-				{ "sampler": "s_tex", "texture": "native" },
-				{ "sampler": "s_prev", "texture": "previous" }
-			],
-			"output": "native"
-		},
-		{	"effect": "phosphor",
-			"name": "Phosphor Store",
-			"disable_conditions": [
-				{ "type": "slider", "name": "adjustments", "value": false },
-				{ "type": "slider", "name": "phosphor", "value": [ 0, 0, 0 ] }
-			],
-			"uniforms": [
-				{ "name": "u_passthrough", "value": [ 1 ] },
-				{ "name": "u_phosphor", "slider": "phosphor" }
-			],
-			"input": [
-				{ "sampler": "s_tex", "texture": "native" },
-				{ "sampler": "s_prev", "texture": "native" }
-			],
-			"output": "previous"
-		},
-		{	"effect": "blit",
-			"name": "Final Blit",
-			"input": [
-				{ "sampler": "s_tex", "texture": "native" }
-			],
-			"output": "backbuffer"
-		}
-	]
-}

bgfx/chains/unfiltered.json

@@ -0,0 +1,25 @@
+{	"name": "Default Nearest-Neighbor Filter",
+	"author": "Ryan Holtz",
+	"targets": [
+		{	"name": "temp",
+			"mode": "guest",
+			"bilinear": false
+		}
+	],
+	"passes": [
+		{	"effect": "blit",
+			"name": "Copy To Unstretched Texture",
+			"input": [
+				{ "sampler": "s_tex", "texture": "screen" }
+			],
+			"output": "temp"
+		},
+		{	"effect": "blit",
+			"name": "Final Upscale",
+			"input": [
+				{ "sampler": "s_tex", "texture": "temp" }
+			],
+			"output": "output"
+		}
+	]
+}

bgfx/effects/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2016, Ryan Holtz and MAME Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of bsd3 nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bgfx/effects/README.md

@@ -0,0 +1,5 @@
+# **Tests** #
+
+Cointains definitions for BGFX shader chains
+
+Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) by Ryan Holtz and MAME Development Team

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"

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"
@@ -14,13 +14,15 @@
     	"rgb": "true",
     	"alpha": "true"
     },
-    "vertex": "vs_ratios",
-    "fragment": "fs_ratios",
+    "vertex": "vs_color",
+    "fragment": "fs_color",
     "uniforms": [
     	{ "name": "s_tex",          "type": "int",  "values": [ 1.0 ] },
-    	{ "name": "u_red_ratios",   "type": "vec4", "values": [ 1.0, 0.0, 0.0, 1.0 ] },
-    	{ "name": "u_grn_ratios",   "type": "vec4", "values": [ 0.0, 1.0, 0.0, 1.0 ] },
-    	{ "name": "u_blu_ratios",   "type": "vec4", "values": [ 0.0, 0.0, 1.0, 1.0 ] },
-    	{ "name": "u_ratio_amount", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] }
+    	{ "name": "u_red_ratios",   "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_grn_ratios",   "type": "vec4", "values": [ 0.0, 1.0, 0.0, 0.0 ] },
+    	{ "name": "u_blu_ratios",   "type": "vec4", "values": [ 0.0, 0.0, 1.0, 0.0 ] },
+    	{ "name": "u_offset",       "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_scale",        "type": "vec4", "values": [ 0.95, 0.95, 0.95, 0.0 ] },
+    	{ "name": "u_saturation",   "type": "vec4", "values": [ 1.5, 0.0, 0.0, 0.0 ] }
     ]
 }

bgfx/effects/deconverge.json

@@ -0,0 +1,29 @@
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": "true",
+    	"alpha": "true"
+    },
+    "vertex": "vs_deconverge",
+    "fragment": "fs_deconverge",
+    "uniforms": [
+    	{ "name": "s_tex",                   "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_converge_red",          "type": "vec4", "values": [ 0.5, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_converge_green",        "type": "vec4", "values": [ 0.0, 0.5, 0.0, 0.0 ] },
+    	{ "name": "u_converge_blue",         "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_radial_converge_red",   "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_radial_converge_green", "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_radial_converge_blue",  "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_source_dims",           "type": "vec4", "values": [ 256.0, 256.0, 0.0, 0.0 ] }
+    ]
+}

bgfx/effects/defocus.json

@@ -0,0 +1,24 @@
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": "true",
+    	"alpha": "true"
+    },
+    "vertex": "vs_defocus",
+    "fragment": "fs_defocus",
+    "uniforms": [
+    	{ "name": "s_tex",         "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_tex_size0",   "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_defocus",     "type": "vec4", "values": [ 0.5, 0.5, 0.0, 0.0 ] }
+    ]
+}

bgfx/effects/distortion.json

@@ -0,0 +1,32 @@
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": "true",
+    	"alpha": "true"
+    },
+    "vertex": "vs_distortion",
+    "fragment": "fs_distortion",
+    "uniforms": [
+    	{ "name": "s_tex",            "type": "int",  "values": [ 0.0 ] },
+    	{ "name": "u_swap_xy",        "type": "vec4", "values": [ 0.0,  0.0, 0.0, 0.0 ] },
+    	{ "name": "u_screen_dims",    "type": "vec4", "values": [ 1.0,  1.0, 0.0, 0.0 ] },
+    	{ "name": "u_quad_dims",      "type": "vec4", "values": [ 1.0,  1.0, 0.0, 0.0 ] },
+    	{ "name": "u_rotation_type",  "type": "vec4", "values": [ 0.0,  0.0, 0.0, 0.0 ] },
+    	{ "name": "u_prepare_vector", "type": "vec4", "values": [ 0.0,  0.0, 0.0, 0.0 ] },
+    	{ "name": "u_curvature",      "type": "vec4", "values": [ 0.25, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_round_corner",   "type": "vec4", "values": [ 0.2,  0.0, 0.0, 0.0 ] },
+    	{ "name": "u_smooth_border",  "type": "vec4", "values": [ 0.05, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_vignetting",     "type": "vec4", "values": [ 0.20, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_reflection",     "type": "vec4", "values": [ 0.30, 0.0, 0.0, 0.0 ] }
+    ]
+}

bgfx/effects/ntsc_decode.json

@@ -0,0 +1,34 @@
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": "true",
+    	"alpha": "true"
+    },
+    "vertex": "vs_ntsc_decode",
+    "fragment": "fs_ntsc_decode",
+    "uniforms": [
+    	{ "name": "s_tex",             "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.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 ] },
+    	{ "name": "u_i_freq_response", "type": "vec4", "values": [ 1.2,  0.0, 0.0, 0.0 ] },
+    	{ "name": "u_q_freq_response", "type": "vec4", "values": [ 0.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 ] }
+    ]
+}

bgfx/effects/ntsc_encode.json

@@ -0,0 +1,30 @@
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": "true",
+    	"alpha": "true"
+    },
+    "vertex": "vs_ntsc_encode",
+    "fragment": "fs_ntsc_encode",
+    "uniforms": [
+    	{ "name": "s_tex",           "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": [ 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 ] }
+    ]
+}

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"

bgfx/effects/post.json

@@ -0,0 +1,47 @@
+{
+    "blend": {
+    	"equation": "add",
+    	"srcColor": "1",
+    	"dstColor": "0",
+    	"srcAlpha": "1",
+    	"dstAlpha": "0"
+    },
+    "depth": {
+    	"function": "always"
+    },
+    "cull": { "mode": "none" },
+    "write": {
+    	"rgb": "true",
+    	"alpha": "true"
+    },
+    "vertex": "vs_post",
+    "fragment": "fs_post",
+    "uniforms": [
+    	{ "name": "s_tex",                    "type": "int",  "values": [ 0.0 ] },
+    	{ "name": "s_shadow",                 "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "u_swap_xy",                "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_screen_dims",            "type": "vec4", "values": [ 1336.0, 1002.0, 0.0, 0.0 ] },
+    	{ "name": "u_source_dims",            "type": "vec4", "values": [ 256.0, 256.0, 0.0, 0.0 ] },
+    	{ "name": "u_shadow_uv_offset",       "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_prepare_bloom",          "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_prepare_vector",         "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_humbar_hertz_rate",      "type": "vec4", "values": [ 0.001, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_humbar_alpha",           "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_time",                   "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_screen_scale",           "type": "vec4", "values": [ 1.0, 1.0, 0.0, 0.0 ] },
+    	{ "name": "u_screen_offset",          "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_scanline_alpha",         "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_scanline_scale",         "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_scanline_bright_scale",  "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_scanline_bright_offset", "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_scanline_jitter",        "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_jitter_amount",          "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_scanline_height",        "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_back_color",             "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_shadow_tile_mode",       "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_shadow_alpha",           "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_shadow_uv",              "type": "vec4", "values": [ 0.25, 0.333, 0.0, 0.0 ] },
+    	{ "name": "u_power",                  "type": "vec4", "values": [ 1.0, 1.0, 1.0, 0.0 ] },
+    	{ "name": "u_floor",                  "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }
+    ]
+}

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"
@@ -17,7 +17,6 @@
     "vertex": "vs_screen",
     "fragment": "fs_screen",
     "uniforms": [
-    	{ "name": "s_tex",  "type": "int",  "values": [ 1.0 ] },
-    	{ "name": "u_tint", "type": "vec4", "values": [ 1.0, 1.0, 1.0, 1.0 ] }
+    	{ "name": "s_tex",  "type": "int",  "values": [ 1.0 ] }
     ]
 }

bgfx/effects/tint.json

@@ -1,24 +0,0 @@
-{
-    "blend": {
-    	"equation": "add",
-    	"srcColor": "srcAlpha",
-    	"dstColor": "1-srcAlpha",
-    	"srcAlpha": "srcAlpha",
-    	"dstAlpha": "1-srcAlpha"
-    },
-    "depth": {
-    	"function": "always"
-    },
-    "cull": { "mode": "none" },
-    "write": {
-    	"rgb": "true",
-    	"alpha": "true"
-    },
-    "vertex": "vs_tint",
-    "fragment": "fs_tint",
-    "uniforms": [
-    	{ "name": "s_tex",   "type": "int",  "values": [ 1.0 ] },
-    	{ "name": "u_tint",  "type": "vec4", "values": [ 1.0, 1.0, 1.0, 1.0 ] },
-    	{ "name": "u_shift", "type": "vec4", "values": [ 0.1, 0.1, 0.0, 0.0 ] }
-    ]
-}