alex/slang-shaders
1
0
Fork 0
mirror of https://github.com/italicsjenga/slang-shaders.git synced 2024-11-26 01:11:32 +11:00
Code Issues Packages Projects Releases Wiki Activity

some cleanups, still not working

Browse source
This commit is contained in:
hunterk 2016-09-16 15:04:16 -05:00
parent 9586b0d58d
commit bfb62584ab
3 changed files with 98 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
test/nonfunctional/shaders/xbr-mlv4-multipass/xbr-mlv4-pass1.slang
View file

@ -49,7 +49,9 @@ const vec4 eq_thresholdold = vec4(15.0, 15.0, 15.0, 15.0);
const vec4 eq_threshold = vec4( 2.0, 2.0, 2.0, 2.0); const vec4 eq_threshold = vec4( 2.0, 2.0, 2.0, 2.0);
const vec4 eq_threshold3 = vec4(25.0, 25.0, 25.0, 25.0); const vec4 eq_threshold3 = vec4(25.0, 25.0, 25.0, 25.0);
const vec3 Yuv_weight = vec3(4.0, 1.0, 2.0); const vec3 Yuv_weight = vec3(4.0, 1.0, 2.0);
const mat3x3 yuv = mat3x3(0.299, 0.587, 0.114, -0.169, -0.331, 0.499, 0.499, -0.418, -0.0813); const mat3x3 yuv = mat3x3(0.299, 0.587, 0.114,
-0.169, -0.331, 0.499,
0.499, -0.418, -0.0813);
const mat3x3 yuvT = mat3x3(0.299, -0.169, 0.499, const mat3x3 yuvT = mat3x3(0.299, -0.169, 0.499,
0.587, -0.331, -0.418, 0.587, -0.331, -0.418,
0.114, 0.499, -0.0813); 0.114, 0.499, -0.0813);
@ -102,9 +104,6 @@ void main()
gl_Position = global.MVP * Position; gl_Position = global.MVP * Position;
vTexCoord = TexCoord; vTexCoord = TexCoord;
float dx = params.SourceSize.z;
float dy = params.SourceSize.w;
// A3 B3 C3 // A3 B3 C3
// A1 B1 C1 // A1 B1 C1
//A2 A0 A B C C4 C6 //A2 A0 A B C C4 C6
@ -113,7 +112,7 @@ void main()
// G5 H5 I5 // G5 H5 I5
// G7 H7 I7 // G7 H7 I7
t1 = vec2(dx, dy); // F H t1 = vec2(params.SourceSize.z, params.SourceSize.w); // F H
} }
#pragma stage fragment #pragma stage fragment
@ -129,51 +128,25 @@ void main()
bvec4 interp_restriction_lv3_left, interp_restriction_lv3_up; bvec4 interp_restriction_lv3_left, interp_restriction_lv3_up;
bvec4 interp_restriction_lv4_left, interp_restriction_lv4_up; bvec4 interp_restriction_lv4_left, interp_restriction_lv4_up;
vec3 A3 = TEX(-1,-3); vec3 A3 = TEX(-1,-3); vec3 B3 = TEX( 0,-3); vec3 C3 = TEX( 1,-3);
vec3 B3 = TEX( 0,-3); vec3 A1 = TEX(-1,-2); vec3 B1 = TEX( 0,-2); vec3 C1 = TEX( 1,-2);
vec3 C3 = TEX( 1,-3); vec3 A2 = TEX(-3,-1); vec3 A0 = TEX(-2,-1); vec3 A = TEX(-1,-1); vec3 B = TEX( 0,-1); vec3 C = TEX( 1,-1); vec3 C4 = TEX( 2,-1); vec3 C6 = TEX( 3,-1);
vec3 A1 = TEX(-1,-2); vec3 D2 = TEX(-3, 0); vec3 D0 = TEX(-2, 0); vec3 D = TEX(-1, 0); vec3 E = TEX( 0, 0); vec3 F = TEX( 1, 0); vec3 F4 = TEX( 2, 0); vec3 F6 = TEX( 3, 0);
vec3 B1 = TEX( 0,-2); vec3 G2 = TEX(-3, 1); vec3 G0 = TEX(-2, 1); vec3 G = TEX(-1, 1); vec3 H = TEX( 0, 1); vec3 I = TEX( 1, 1); vec3 I4 = TEX( 2, 1); vec3 I6 = TEX( 3, 1);
vec3 C1 = TEX( 1,-2); vec3 G5 = TEX(-1, 2); vec3 H5 = TEX( 0, 2); vec3 I5 = TEX( 1, 2);
vec3 A2 = TEX(-3,-1); vec3 G7 = TEX(-1, 3); vec3 H7 = TEX( 0, 3); vec3 I7 = TEX( 1, 3);
vec3 A0 = TEX(-2,-1);
vec3 A = TEX(-1,-1);
vec3 B = TEX( 0,-1);
vec3 C = TEX( 1,-1);
vec3 C4 = TEX( 2,-1);
vec3 C6 = TEX( 3,-1);
vec3 D2 = TEX(-3, 0);
vec3 D0 = TEX(-2, 0);
vec3 D = TEX(-1, 0);
vec3 E = TEX( 0, 0);
vec3 F = TEX( 1, 0);
vec3 F4 = TEX( 2, 0);
vec3 F6 = TEX( 3, 0);
vec3 G2 = TEX(-3, 1);
vec3 G0 = TEX(-2, 1);
vec3 G = TEX(-1, 1);
vec3 H = TEX( 0, 1);
vec3 I = TEX( 1, 1);
vec3 I4 = TEX( 2, 1);
vec3 I6 = TEX( 3, 1);
vec3 G5 = TEX(-1, 2);
vec3 H5 = TEX( 0, 2);
vec3 I5 = TEX( 1, 2);
vec3 G7 = TEX(-1, 3);
vec3 H7 = TEX( 0, 3);
vec3 I7 = TEX( 1, 3);
mat4x3 bdhf = yuvT * mat4x3(B, D, H, F); mat4x3 bdhf0 = yuvT * mat4x3(B, D, H, F);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf0 = mat4x3(abs(bdhf0[0]), abs(bdhf0[1]), abs(bdhf0[2]), abs(bdhf0[3]));
vec4 b = Yuv_weight * bdhf; vec4 b = Yuv_weight * bdhf0;
bdhf = yuvT * mat4x3(C, A, G, I); mat4x3 bdhf1 = yuvT * mat4x3(C, A, G, I);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf1 = mat4x3(abs(bdhf1[0]), abs(bdhf1[1]), abs(bdhf1[2]), abs(bdhf1[3]));
vec4 c = Yuv_weight * bdhf; vec4 c = Yuv_weight * bdhf1;
bdhf = yuvT * mat4x3(E, E, E, E); mat4x3 bdhf2 = yuvT * mat4x3(E, E, E, E);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf2 = mat4x3(abs(bdhf2[0]), abs(bdhf2[1]), abs(bdhf2[2]), abs(bdhf2[3]));
vec4 e = Yuv_weight * bdhf; vec4 e = Yuv_weight * bdhf2;
vec4 d = b.yzwx; vec4 d = b.yzwx;
vec4 f = b.wxyz; vec4 f = b.wxyz;
@ -181,39 +154,37 @@ void main()
vec4 h = b.zwxy; vec4 h = b.zwxy;
vec4 i = c.wxyz; vec4 i = c.wxyz;
bdhf = yuvT * mat4x3(I4, C1, A0, G5); mat4x3 bdhf3 = yuvT * mat4x3(I4, C1, A0, G5);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf3 = mat4x3(abs(bdhf3[0]), abs(bdhf3[1]), abs(bdhf3[2]), abs(bdhf3[3]));
vec4 i4 = Yuv_weight * bdhf; vec4 i4 = Yuv_weight * bdhf3;
bdhf = yuvT * mat4x3(I5, C4, A1, G0); mat4x3 bdhf4 = yuvT * mat4x3(I5, C4, A1, G0);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf4 = mat4x3(abs(bdhf4[0]), abs(bdhf4[1]), abs(bdhf4[2]), abs(bdhf4[3]));
vec4 i5 = Yuv_weight * bdhf; vec4 i5 = Yuv_weight * bdhf4;
bdhf = yuvT * mat4x3(H5, F4, B1, D0); mat4x3 bdhf5 = yuvT * mat4x3(H5, F4, B1, D0);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf5 = mat4x3(abs(bdhf5[0]), abs(bdhf5[1]), abs(bdhf5[2]), abs(bdhf5[3]));
vec4 h5 = Yuv_weight * bdhf; vec4 h5 = Yuv_weight * bdhf5;
vec4 f4 = h5.yzwx; vec4 f4 = h5.yzwx;
vec4 c1 = i4.yzwx; vec4 c1 = i4.yzwx;
vec4 g0 = i5.wxyz; vec4 g0 = i5.wxyz;
vec4 b1 = h5.zwxy; vec4 b1 = h5.zwxy;
vec4 d0 = h5.wxyz; vec4 d0 = h5.wxyz;
bdhf = yuvT * mat4x3(I6, C3, A2, G7); mat4x3 bdhf6 = yuvT * mat4x3(I6, C3, A2, G7);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf6 = mat4x3(abs(bdhf6[0]), abs(bdhf6[1]), abs(bdhf6[2]), abs(bdhf6[3]));
vec4 i6 = Yuv_weight * bdhf; vec4 i6 = Yuv_weight * bdhf6;
bdhf = yuvT * mat4x3(I7, C6, A3, G2); mat4x3 bdhf7 = yuvT * mat4x3(I7, C6, A3, G2);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf7 = mat4x3(abs(bdhf7[0]), abs(bdhf7[1]), abs(bdhf7[2]), abs(bdhf7[3]));
vec4 i7 = Yuv_weight * bdhf; vec4 i7 = Yuv_weight * bdhf7;
bdhf = yuvT * mat4x3(H7, F6, B3, D2); mat4x3 bdhf8 = yuvT * mat4x3(H7, F6, B3, D2);
bdhf = mat4x3(abs(bdhf[0]), abs(bdhf[1]), abs(bdhf[2]), abs(bdhf[3])); bdhf8 = mat4x3(abs(bdhf8[0]), abs(bdhf8[1]), abs(bdhf8[2]), abs(bdhf8[3]));
vec4 h7 = Yuv_weight * bdhf; vec4 h7 = Yuv_weight * bdhf8;
vec4 f6 = h7.yzwx; vec4 f6 = h7.yzwx;
vec4 c3 = i6.yzwx; vec4 c3 = i6.yzwx;
vec4 g2 = i7.wxyz; vec4 g2 = i7.wxyz;
vec4 b3 = h7.zwxy; vec4 b3 = h7.zwxy;
@ -240,8 +211,15 @@ void main()
edr4_up = (greaterThanEqual(df(f,g2) , (cf4*df(h,c3))) == bvec4(true) && interp_restriction_lv4_up == bvec4(true) && edr3_up == bvec4(true)) ? bvec4(true) : bvec4(false); edr4_up = (greaterThanEqual(df(f,g2) , (cf4*df(h,c3))) == bvec4(true) && interp_restriction_lv4_up == bvec4(true) && edr3_up == bvec4(true)) ? bvec4(true) : bvec4(false);
vec4 info; vec4 info;
info = (edr0 == bvec4(true)) ? vec4(1.0) : vec4(0.0);
info = (edr4_left == bvec4(true) && edr4_up == bvec4(false)) ? vec4(8.0) : ((edr4_up == bvec4(true) && edr4_left == bvec4(false)) ? vec4(7.0) : ((edr3_left == bvec4(true) && edr3_up == bvec4(false)) ? vec4(6.0) : ((edr3_up == bvec4(true) && edr3_left == bvec4(false)) ? vec4(5.0) : ((edr_left == bvec4(true) && edr_up == bvec4(false)) ? vec4(4.0) : ((edr_up == bvec4(true) && edr_left == bvec4(false)) ? vec4(3.0) : (edr == bvec4(true) ? vec4(2.0) : (edr0 == bvec4(true) ? vec4(1.0) : vec4(0.0)))))))); info = (edr == bvec4(true)) ? vec4(2.0) : info;
info = (edr_up == bvec4(true) && edr_left == bvec4(false)) ? vec4(3.0) : info;
info = (edr_left == bvec4(true) && edr_up == bvec4(false)) ? vec4(4.0) : info;
info = (edr3_up == bvec4(true) && edr3_left == bvec4(false)) ? vec4(5.0) : info;
info = (edr3_left == bvec4(true) && edr3_up == bvec4(false)) ? vec4(6.0) : info;
info = (edr4_up == bvec4(true) && edr4_left == bvec4(false)) ? vec4(7.0) : info;
info = (edr4_left == bvec4(true) && edr4_up == bvec4(false)) ? vec4(8.0) : info;
// info = (edr4_left == bvec4(true) && edr4_up == bvec4(false)) ? vec4(8.0) : ((edr4_up == bvec4(true) && edr4_left == bvec4(false)) ? vec4(7.0) : ((edr3_left == bvec4(true) && edr3_up == bvec4(false)) ? vec4(6.0) : ((edr3_up == bvec4(true) && edr3_left == bvec4(false)) ? vec4(5.0) : ((edr_left == bvec4(true) && edr_up == bvec4(false)) ? vec4(4.0) : ((edr_up == bvec4(true) && edr_left == bvec4(false)) ? vec4(3.0) : (edr == bvec4(true) ? vec4(2.0) : (edr0 == bvec4(true) ? vec4(1.0) : vec4(0.0))))))));
FragColor = vec4(remapTo01(info, maximo)); FragColor = vec4(remapTo01(info, maximo));
} }

2
test/nonfunctional/shaders/xbr-mlv4-multipass/xbr-mlv4-pass4.slang
View file

@ -45,8 +45,6 @@ const vec3 bin = vec3( 4.0f, 2.0f, 1.0f);
const vec4 low = vec4(-64.0f, -64.0f, -64.0f, -64.0f); const vec4 low = vec4(-64.0f, -64.0f, -64.0f, -64.0f);
const vec4 high = vec4( 64.0f, 64.0f, 64.0f, 64.0f); const vec4 high = vec4( 64.0f, 64.0f, 64.0f, 64.0f);
const mat2x4 sym_vectors = mat2x4(1, 1, -1, -1, 1, -1, -1, 1);
vec4 remapFrom01(vec4 v, vec4 low, vec4 high) vec4 remapFrom01(vec4 v, vec4 low, vec4 high)
{ {
return round(mix(low, high, v)); return round(mix(low, high, v));