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

Merge pull request #23 from rz5/master

Browse source 
(super-xbr) Use 'Original' instead of 'OriginalHistory1'. The latter
This commit is contained in:
hizzlekizzle 2016-07-30 18:25:34 -05:00 committed by GitHub
parent 6baa6ec488 f911cffd3f
commit 18bcb94089
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
xbr/shaders/super-xbr/super-xbr-pass1.slang
View file

@ -34,7 +34,6 @@ layout(std140, set = 0, binding = 0) uniform UBO
vec4 OriginalSize; vec4 OriginalSize;
vec4 SourceSize; vec4 SourceSize;
uint FrameCount; uint FrameCount;
vec4 OriginalHistorySize1;
} global; } global;
#pragma stage vertex #pragma stage vertex
@ -53,7 +52,7 @@ void main()
layout(location = 0) in vec2 vTexCoord; layout(location = 0) in vec2 vTexCoord;
layout(location = 0) out vec4 FragColor; layout(location = 0) out vec4 FragColor;
layout(set = 0, binding = 2) uniform sampler2D Source; layout(set = 0, binding = 2) uniform sampler2D Source;
layout(set = 0, binding = 3) uniform sampler2D OriginalHistory1; layout(set = 0, binding = 3) uniform sampler2D Original;
#define wp1 1.0 #define wp1 1.0
#define wp2 0.0 #define wp2 0.0
@ -121,29 +120,29 @@ void main()
vec2 fp = fract(vTexCoord*global.SourceSize.xy); vec2 fp = fract(vTexCoord*global.SourceSize.xy);
vec2 dir = fp - vec2(0.5, 0.5); vec2 dir = fp - vec2(0.5, 0.5);
if ((dir.x*dir.y) > 0.0) if ((dir.x*dir.y) > 0.0)
FragColor = (fp.x > 0.5) ? texture(Source, vTexCoord) : texture(OriginalHistory1, vTexCoord); FragColor = (fp.x > 0.5) ? texture(Source, vTexCoord) : texture(Original, vTexCoord);
vec2 g1 = (fp.x>0.5) ? vec2(0.5*global.SourceSize.z, 0.0) : vec2(0.0, 0.5*global.SourceSize.w); vec2 g1 = (fp.x>0.5) ? vec2(0.5*global.SourceSize.z, 0.0) : vec2(0.0, 0.5*global.SourceSize.w);
vec2 g2 = (fp.x>0.5) ? vec2(0.0, 0.5*global.SourceSize.w) : vec2(0.5*global.SourceSize.z, 0.0); vec2 g2 = (fp.x>0.5) ? vec2(0.0, 0.5*global.SourceSize.w) : vec2(0.5*global.SourceSize.z, 0.0);
vec3 P0 = texture(OriginalHistory1, vTexCoord -3.0*g1 ).xyz; vec3 P0 = texture(Original, vTexCoord -3.0*g1 ).xyz;
vec3 P1 = texture( Source, vTexCoord -3.0*g2).xyz; vec3 P1 = texture( Source, vTexCoord -3.0*g2).xyz;
vec3 P2 = texture( Source, vTexCoord +3.0*g2).xyz; vec3 P2 = texture( Source, vTexCoord +3.0*g2).xyz;
vec3 P3 = texture(OriginalHistory1, vTexCoord +3.0*g1 ).xyz; vec3 P3 = texture(Original, vTexCoord +3.0*g1 ).xyz;
vec3 B = texture( Source, vTexCoord -2.0*g1 -g2).xyz; vec3 B = texture( Source, vTexCoord -2.0*g1 -g2).xyz;
vec3 C = texture(OriginalHistory1, vTexCoord -g1 -2.0*g2).xyz; vec3 C = texture(Original, vTexCoord -g1 -2.0*g2).xyz;
vec3 D = texture( Source, vTexCoord -2.0*g1 +g2).xyz; vec3 D = texture( Source, vTexCoord -2.0*g1 +g2).xyz;
vec3 E = texture(OriginalHistory1, vTexCoord -g1 ).xyz; vec3 E = texture(Original, vTexCoord -g1 ).xyz;
vec3 F = texture( Source, vTexCoord -g2).xyz; vec3 F = texture( Source, vTexCoord -g2).xyz;
vec3 G = texture(OriginalHistory1, vTexCoord -g1 +2.0*g2).xyz; vec3 G = texture(Original, vTexCoord -g1 +2.0*g2).xyz;
vec3 H = texture( Source, vTexCoord +g2).xyz; vec3 H = texture( Source, vTexCoord +g2).xyz;
vec3 I = texture(OriginalHistory1, vTexCoord +g1 ).xyz; vec3 I = texture(Original, vTexCoord +g1 ).xyz;
vec3 F4 = texture(OriginalHistory1, vTexCoord +g1 -2.0*g2).xyz; vec3 F4 = texture(Original, vTexCoord +g1 -2.0*g2).xyz;
vec3 I4 = texture( Source, vTexCoord +2.0*g1 -g2).xyz; vec3 I4 = texture( Source, vTexCoord +2.0*g1 -g2).xyz;
vec3 H5 = texture(OriginalHistory1, vTexCoord +g1 +2.0*g2).xyz; vec3 H5 = texture(Original, vTexCoord +g1 +2.0*g2).xyz;
vec3 I5 = texture( Source, vTexCoord +2.0*g1 +g2).xyz; vec3 I5 = texture( Source, vTexCoord +2.0*g1 +g2).xyz;
float b = RGBtoYUV( B ); float b = RGBtoYUV( B );
float c = RGBtoYUV( C ); float c = RGBtoYUV( C );

6
xbr/shaders/super-xbr-2p.slangp → xbr/super-xbr-2p.slangp
View file

@ -1,19 +1,19 @@
shaders = 3 shaders = 3
shader0 = super-xbr/super-xbr-pass0.slang shader0 = shaders/super-xbr/super-xbr-pass0.slang
filter_linear0 = false filter_linear0 = false
scale_type_x0 = "source" scale_type_x0 = "source"
scale_x0 = "1.000000" scale_x0 = "1.000000"
scale_type_y0 = "source" scale_type_y0 = "source"
scale_y0 = "1.000000" scale_y0 = "1.000000"
shader1 = super-xbr/super-xbr-pass1.slang shader1 = shaders/super-xbr/super-xbr-pass1.slang
filter_linear1 = false filter_linear1 = false
scale_type_x1 = "source" scale_type_x1 = "source"
scale_x1 = "2.000000" scale_x1 = "2.000000"
scale_type_y1 = "source" scale_type_y1 = "source"
scale_y1 = "2.000000" scale_y1 = "2.000000"
shader2 = super-xbr/custom-jinc2-sharper.slang shader2 = shaders/super-xbr/custom-jinc2-sharper.slang
filter_linear2 = false filter_linear2 = false