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

Update crt-pi.slang

Browse source 
Add run-time parameters, replace 'gl_FragCoord' with 'vTexCoord / OutputSize.xy' because the spec recommends it.
This commit is contained in:
rz5 2016-08-03 03:09:01 +01:00 committed by GitHub
parent c0f0de0512
commit 419c7c580b
1 changed files with 49 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
crt/shaders/crt-pi.slang
View file

@ -1,5 +1,26 @@
#version 450 #version 450
layout(push_constant) uniform Push
{
float CURVATURE_X;
float CURVATURE_Y;
float MASK_BRIGHTNESS;
float SCANLINE_WEIGHT;
float SCANLINE_GAP_BRIGHTNESS;
float BLOOM_FACTOR;
float INPUT_GAMMA;
float OUTPUT_GAMMA;
} param;
#pragma parameter CURVATURE_X "Screen curvature - horizontal" 0.10 0.0 1.0 0.01
#pragma parameter CURVATURE_Y "Screen curvature - vertical" 0.15 0.0 1.0 0.01
#pragma parameter MASK_BRIGHTNESS "Mask brightness" 0.70 0.0 1.0 0.01
#pragma parameter SCANLINE_WEIGHT "Scanline weight" 6.0 0.0 15.0 0.1
#pragma parameter SCANLINE_GAP_BRIGHTNESS "Scanline gap brightness" 0.12 0.0 1.0 0.01
#pragma parameter BLOOM_FACTOR "Bloom factor" 1.5 0.0 5.0 0.01
#pragma parameter INPUT_GAMMA "Input gamma" 2.4 0.0 5.0 0.01
#pragma parameter OUTPUT_GAMMA "Output gamma" 2.2 0.0 5.0 0.01
layout(std140, set = 0, binding = 0) uniform UBO layout(std140, set = 0, binding = 0) uniform UBO
{ {
mat4 MVP; mat4 MVP;
@ -8,14 +29,24 @@ layout(std140, set = 0, binding = 0) uniform UBO
vec4 SourceSize; vec4 SourceSize;
} global; } global;
#define CURVATURE_X 0.10 #pragma stage vertex
#define CURVATURE_Y 0.25 layout(location = 0) in vec4 Position;
#define MASK_BRIGHTNESS 0.70 layout(location = 1) in vec2 TexCoord;
#define SCANLINE_WEIGHT 6.0 layout(location = 0) out vec2 vTexCoord;
#define SCANLINE_GAP_BRIGHTNESS 0.12 layout(location = 1) out float filterWidth;
#define BLOOM_FACTOR 1.5
#define INPUT_GAMMA 2.4 void main()
#define OUTPUT_GAMMA 2.2 {
gl_Position = global.MVP * Position;
vTexCoord = TexCoord;
filterWidth = (global.SourceSize.y * global.OutputSize.w) * 0.333333333;
}
#pragma stage fragment
layout(location = 0) in vec2 vTexCoord;
layout(location = 1) in float filterWidth;
layout(location = 0) out vec4 FragColor;
layout(set = 0, binding = 2) uniform sampler2D Source;
/* MASK_TYPE: 0 = none, 1 = green/magenta, 2 = trinitron(ish) */ /* MASK_TYPE: 0 = none, 1 = green/magenta, 2 = trinitron(ish) */
#define MASK_TYPE 2 #define MASK_TYPE 2
@ -27,7 +58,6 @@ layout(std140, set = 0, binding = 0) uniform UBO
//#define SHARPER //#define SHARPER
#define MULTISAMPLE #define MULTISAMPLE
/* /*
crt-pi - A Raspberry Pi friendly CRT shader. crt-pi - A Raspberry Pi friendly CRT shader.
Copyright (C) 2015-2016 davej Copyright (C) 2015-2016 davej
@ -68,27 +98,8 @@ MASK_TYPE defines what, if any, shadow mask to use. MASK_BRIGHTNESS defines how
much the mask type darkens the screen. much the mask type darkens the screen.
*/ */
#pragma stage vertex
layout(location = 0) in vec4 Position;
layout(location = 1) in vec2 TexCoord;
layout(location = 0) out vec2 vTexCoord;
layout(location = 1) out float filterWidth;
void main()
{
gl_Position = global.MVP * Position;
vTexCoord = TexCoord;
filterWidth = (global.SourceSize.y * global.OutputSize.w) * 0.333333333;
}
#pragma stage fragment
layout(location = 0) in vec2 vTexCoord;
layout(location = 1) in float filterWidth;
layout(location = 0) out vec4 FragColor;
layout(set = 0, binding = 2) uniform sampler2D Source;
#if defined(CURVATURE) #if defined(CURVATURE)
vec2 CURVATURE_DISTORTION = vec2(CURVATURE_X, CURVATURE_Y); vec2 CURVATURE_DISTORTION = vec2(param.CURVATURE_X, param.CURVATURE_Y);
// Barrel distortion shrinks the display area a bit, this will allow us to counteract that. // Barrel distortion shrinks the display area a bit, this will allow us to counteract that.
vec2 barrelScale = 1.0 - (0.23 * CURVATURE_DISTORTION); vec2 barrelScale = 1.0 - (0.23 * CURVATURE_DISTORTION);
@ -113,7 +124,7 @@ vec2 Distort(vec2 coord)
float CalcScanLineWeight(float dist) float CalcScanLineWeight(float dist)
{ {
return max(1.0-dist*dist*SCANLINE_WEIGHT, SCANLINE_GAP_BRIGHTNESS); return max(1.0-dist*dist*param.SCANLINE_WEIGHT, param.SCANLINE_GAP_BRIGHTNESS);
} }
float CalcScanLine(float dy) float CalcScanLine(float dy)
@ -179,33 +190,33 @@ void main()
#if defined(GAMMA) && defined(FAKE_GAMMA) #if defined(GAMMA) && defined(FAKE_GAMMA)
colour = colour * colour; colour = colour * colour;
#elif defined(GAMMA) #elif defined(GAMMA)
colour = pow(colour, vec3(INPUT_GAMMA)); colour = pow(colour, vec3(param.INPUT_GAMMA));
#endif #endif
/* Apply scanlines */ /* Apply scanlines */
scanLineWeight *= BLOOM_FACTOR; scanLineWeight *= param.BLOOM_FACTOR;
colour *= scanLineWeight; colour *= scanLineWeight;
#if defined(GAMMA) && defined(FAKE_GAMMA) #if defined(GAMMA) && defined(FAKE_GAMMA)
colour = sqrt(colour); colour = sqrt(colour);
#elif defined(GAMMA) #elif defined(GAMMA)
colour = pow(colour, vec3(1.0/OUTPUT_GAMMA)); colour = pow(colour, vec3(1.0/param.OUTPUT_GAMMA));
#endif #endif
#endif /* SCANLINES */ #endif /* SCANLINES */
#if MASK_TYPE == 1 #if MASK_TYPE == 1
float whichMask = fract(gl_FragCoord.x * 0.5); float whichMask = fract((vTexCoord.x * global.OutputSize.x) * 0.5);
vec3 mask = vec3(1.0); vec3 mask = vec3(1.0);
if (whichMask < 0.5) mask.rb = vec2(MASK_BRIGHTNESS); if (whichMask < 0.5) mask.rb = vec2(param.MASK_BRIGHTNESS);
else mask.g = MASK_BRIGHTNESS; else mask.g = param.MASK_BRIGHTNESS;
colour *= mask; colour *= mask;
#elif MASK_TYPE == 2 #elif MASK_TYPE == 2
float whichMask = fract(gl_FragCoord.x * 0.3333333); float whichMask = fract((vTexCoord.x * global.OutputSize.x) * 0.3333333);
vec3 mask = vec3(MASK_BRIGHTNESS); vec3 mask = vec3(param.MASK_BRIGHTNESS);
if (whichMask < 0.3333333) mask.r = 1.0; if (whichMask < 0.3333333) mask.r = 1.0;
else if (whichMask < 0.6666666) mask.g = 1.0; else if (whichMask < 0.6666666) mask.g = 1.0;