diff --git a/bgfx/chains/xbr/xbr-lv2-multipass.json b/bgfx/chains/xbr/xbr-lv2-multipass.json index 8876bbdde9b..50a46de3287 100644 --- a/bgfx/chains/xbr/xbr-lv2-multipass.json +++ b/bgfx/chains/xbr/xbr-lv2-multipass.json @@ -52,7 +52,8 @@ "effect": "xbr/xbr-lv2-multipass/xbr-lv2-pass1", "name": "Pass 1", "input": [ - { "sampler": "decal", "target": "internal" } + { "sampler": "decal", "target": "internal" }, + { "sampler": "ORIG_texture", "target": "screen" } ], "output": "output" } diff --git a/bgfx/shaders/dx11/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin b/bgfx/shaders/dx11/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin index 0ac5f18d87a..c8aa8bd5a65 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin and b/bgfx/shaders/dx11/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin differ diff --git a/bgfx/shaders/dx11/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin b/bgfx/shaders/dx11/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin index 59510dfd4d9..2d70e802834 100644 Binary files a/bgfx/shaders/dx11/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin and b/bgfx/shaders/dx11/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin b/bgfx/shaders/dx9/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin index d2fa174d4ac..6b64b65abf1 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin and b/bgfx/shaders/dx9/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin differ diff --git a/bgfx/shaders/dx9/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin b/bgfx/shaders/dx9/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin index 3bb8f5e2797..5671ca9d779 100644 Binary files a/bgfx/shaders/dx9/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin and b/bgfx/shaders/dx9/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin b/bgfx/shaders/essl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin index 2788c66aaee..cbe5aa972ad 100644 Binary files a/bgfx/shaders/essl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin and b/bgfx/shaders/essl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin differ diff --git a/bgfx/shaders/essl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin b/bgfx/shaders/essl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin index 4421f9fd736..d28adbec034 100644 Binary files a/bgfx/shaders/essl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin and b/bgfx/shaders/essl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin b/bgfx/shaders/glsl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin index 81460e54d9d..61923aa8af2 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin and b/bgfx/shaders/glsl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin differ diff --git a/bgfx/shaders/glsl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin b/bgfx/shaders/glsl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin index 0e1d66c1644..91df8548dd5 100644 Binary files a/bgfx/shaders/glsl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin and b/bgfx/shaders/glsl/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin b/bgfx/shaders/metal/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin index 740714cdc80..2ad81f7c2ce 100644 Binary files a/bgfx/shaders/metal/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin and b/bgfx/shaders/metal/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.bin differ diff --git a/bgfx/shaders/metal/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin b/bgfx/shaders/metal/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin index c92a1618152..51daeaebb31 100644 Binary files a/bgfx/shaders/metal/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin and b/bgfx/shaders/metal/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.bin differ diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc index 05b2398ad9c..e7cc84b299d 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-c-pass0.sc @@ -36,26 +36,6 @@ SAMPLER2D(decal, 0); #define round(X) floor((X)+0.5) -const float coef = 2.0; -const vec4 eq_threshold = vec4(15.0, 15.0, 15.0, 15.0); -const float y_weight = 48.0; -const float u_weight = 7.0; -const float v_weight = 6.0; -const mat4 yuv = mat4( - 0.299, 0.587, 0.114, 0.0, - -0.169, -0.331, 0.499, 0.0, - 0.499, -0.418, -0.0813, 0.0, - 0.0, 0.0, 0.0, 0.0 -); - -const mat4 yuv_weighted = mat4( - 48.0 * vec4( 0.299, 0.587, 0.114, 0.0), - 7.0 * vec4(-0.169, -0.331, 0.499, 0.0), - 6.0 * vec4( 0.499, -0.418, -0.0813, 0.0), - 0.0 * vec4( 0.0, 0.0, 0.0, 0.0) -); -const vec4 delta = vec4(0.4, 0.4, 0.4, 0.4); - vec3 remapTo01(vec3 v, vec3 low, vec3 high) { return saturate((v - low) / (high-low)); @@ -72,24 +52,14 @@ float c_df(vec3 c1, vec3 c2) return df.r + df.g + df.b; } -vec4 le(vec4 A, vec4 B) +vec4 eq(vec4 A, vec4 B) { - return vec4(lessThanEqual(A, B)); + return vec4(lessThan(df(A, B), vec4(15.0, 15.0, 15.0, 15.0))); } -vec4 ge(vec4 A, vec4 B) +vec4 neq(vec4 A, vec4 B) { - return vec4(greaterThanEqual(A, B)); -} - -vec4 lt(vec4 A, vec4 B) -{ - return vec4(lessThan(A, B)); -} - -vec4 ne(vec4 A, vec4 B) -{ - return vec4(notEqual(A, B)); + return vec4(greaterThanEqual(df(A, B), vec4(15.0, 15.0, 15.0, 15.0))); } vec4 weighted_distance(vec4 a, vec4 b, vec4 c, vec4 d, vec4 e, vec4 f, vec4 g, vec4 h) @@ -99,6 +69,11 @@ vec4 weighted_distance(vec4 a, vec4 b, vec4 c, vec4 d, vec4 e, vec4 f, vec4 g, v void main() { + float coef = 2.0; + + vec4 yuv_weighted = 48.0 * vec4( 0.299, 0.587, 0.114, 0.0); + vec4 delta = vec4(0.4, 0.4, 0.4, 0.4); + vec4 A1 = texture2D(decal, v_texcoord1.xw); vec4 B1 = texture2D(decal, v_texcoord1.yw); vec4 C1 = texture2D(decal, v_texcoord1.zw); @@ -127,28 +102,28 @@ void main() vec4 F4 = texture2D(decal, v_texcoord7.xz); vec4 I4 = texture2D(decal, v_texcoord7.xw); - vec4 b = mul(mat4(B, D, H, F), yuv_weighted[0]); - vec4 c = mul(mat4(C, A, G, I), yuv_weighted[0]); - vec4 e = mul(mat4(E, E, E, E), yuv_weighted[0]); + vec4 b = instMul(yuv_weighted, mat4(B, D, H, F)); + vec4 c = instMul(yuv_weighted, mat4(C, A, G, I)); + vec4 e = instMul(yuv_weighted, mat4(E, E, E, E)); vec4 d = b.yzwx; vec4 f = b.wxyz; vec4 g = c.zwxy; vec4 h = b.zwxy; vec4 i = c.wxyz; - vec4 i4 = mul(mat4(I4, C1, A0, G5), yuv_weighted[0]); - vec4 i5 = mul(mat4(I5, C4, A1, G0), yuv_weighted[0]); - vec4 h5 = mul(mat4(H5, F4, B1, D0), yuv_weighted[0]); + vec4 i4 = instMul(yuv_weighted, mat4(I4, C1, A0, G5)); + vec4 i5 = instMul(yuv_weighted, mat4(I5, C4, A1, G0)); + vec4 h5 = instMul(yuv_weighted, mat4(H5, F4, B1, D0)); vec4 f4 = h5.yzwx; - vec4 interp_restriction_lv1 = clamp(ne(e,f) * ne(e,h) * (ge(f,b) * ge(f,c) + ge(h,d) * ge(h,g) + lt(e,i) * (ge(f,f4) * ge(f,i4) + ge(h,h5) * ge(h,i5)) + lt(e,g) + lt(e,c)), 0.0, 1.0); - vec4 interp_restriction_lv2_left = ne(e,g) * ne(d,g); - vec4 interp_restriction_lv2_up = ne(e,c) * ne(b,c); - - vec4 edr = lt(weighted_distance(e, c, g, i, h5, f4, h, f), weighted_distance(h, d, i5, f, i4, b, e, i)) * interp_restriction_lv1; - vec4 edr_left = le(coef * df(f,g), df(h,c)) * interp_restriction_lv2_left * edr; - vec4 edr_up = ge(df(f,g), coef * df(h,c)) * interp_restriction_lv2_up * edr; - + vec4 interp_restriction_lv1 = clamp(vec4(notEqual(e,f)) * vec4(notEqual(e,h)) * ( neq(f,b) * neq(f,c) + neq(h,d) * neq(h,g) + eq(e,i) * (neq(f,f4) * neq(f,i4) + neq(h,h5) * neq(h,i5)) + eq(e,g) + eq(e,c)), vec4(0.0, 0.0, 0.0, 0.0), vec4(1.0, 1.0, 1.0, 1.0)); + vec4 interp_restriction_lv2_left = vec4(notEqual(e,g)) * vec4(notEqual(d,g)); + vec4 interp_restriction_lv2_up = vec4(notEqual(e,c)) * vec4(notEqual(b,c)); + + vec4 edr = vec4(lessThan(weighted_distance(e, c, g, i, h5, f4, h, f), weighted_distance(h, d, i5, f, i4, b, e, i))) * interp_restriction_lv1; + vec4 edr_left = vec4(lessThanEqual(coef * df(f,g), df(h,c))) * interp_restriction_lv2_left * edr; + vec4 edr_up = vec4(greaterThanEqual(df(f,g), coef * df(h,c))) * interp_restriction_lv2_up * edr; + vec3 info; info.x = dot(edr, vec4(8.0, 4.0, 2.0, 1.0)); info.y = dot(edr_left, vec4(8.0, 4.0, 2.0, 1.0)); diff --git a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc index b34ad4fe005..6316e485725 100644 --- a/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc +++ b/src/osd/modules/render/bgfx/shaders/chains/xbr/xbr-lv2-multipass/fs_xbr-lv2-pass1.sc @@ -41,47 +41,11 @@ uniform vec4 u_target_dims; #define round(X) floor((X)+0.5) -const float coef = 2.0; -const vec4 eq_threshold = vec4(15.0, 15.0, 15.0, 15.0); -const float y_weight = 48.0; -const float u_weight = 7.0; -const float v_weight = 6.0; -const mat4 yuv = mat4( - 0.299, 0.587, 0.114, 0.0, - -0.169, -0.331, 0.499, 0.0, - 0.499, -0.418, -0.0813, 0.0, - 0.0, 0.0, 0.0, 0.0 -); - -const mat4 yuv_weighted = mat4( - 48.0 * vec4( 0.299, 0.587, 0.114, 0.0), - 7.0 * vec4(-0.169, -0.331, 0.499, 0.0), - 6.0 * vec4( 0.499, -0.418, -0.0813, 0.0), - 0.0 * vec4( 0.0, 0.0, 0.0, 0.0) -); - vec4 df(vec4 A, vec4 B) { return vec4(abs(A-B)); } -float c_df(vec3 c1, vec3 c2) -{ - vec3 df = abs(c1 - c2); - return df.r + df.g + df.b; -} - -vec4 le(vec4 A, vec4 B) -{ - return vec4(lessThanEqual(A, B)); -} - -vec4 weighted_distance(vec4 a, vec4 b, vec4 c, vec4 d, vec4 e, vec4 f, vec4 g, vec4 h) -{ - return (df(a,b) + df(a,c) + df(d,e) + df(d,f) + 4.0*df(g,h)); -} - - vec3 remapFrom01(vec3 v, vec3 low, vec3 high) { return round(mix(low, high, v)); @@ -107,6 +71,10 @@ vec4 unpack_info(float i) void main() { + float coef = 2.0; + + vec4 yuv_weighted = 48.0 * vec4(0.299, 0.587, 0.114, 0.0); + vec2 fp = fract(v_texcoord0 * u_tex_size0.xy); vec4 B = texture2D(ORIG_texture, v_texcoord1.xy); @@ -115,8 +83,8 @@ void main() vec4 F = texture2D(ORIG_texture, v_texcoord2.zw); vec4 H = texture2D(ORIG_texture, v_texcoord1.xw); - vec4 b = mul(mat4(B, D, H, F), yuv_weighted[0]); - vec4 e = mul(mat4(E, E, E, E), yuv_weighted[0]); + vec4 b = instMul(yuv_weighted, mat4(B, D, H, F)); + vec4 e = instMul(yuv_weighted, mat4(E, E, E, E)); vec4 d = b.yzwx; vec4 f = b.wxyz; vec4 h = b.zwxy; @@ -154,12 +122,12 @@ void main() fx30 = edr_left * fx30; fx60 = edr_up * fx60; - vec4 px = le(df(e,f), df(e,h)); + vec4 px = vec4(lessThanEqual(df(e,f), df(e,h))); vec4 maximo = max(max(fx30, fx60), fx45); mat4 pix = mat4(mix(E, mix(H, F, px.x), maximo.x), mix(E, mix(F, B, px.y), maximo.y), mix(E, mix(B, D, px.z), maximo.z), mix(E, mix(D, H, px.w), maximo.w)); - vec4 pixel = mul(pix, yuv_weighted[0]); + vec4 pixel = instMul(yuv_weighted, pix); vec4 diff = df(pixel,e);