Skip to content

crt-lottes and pixellate now use hardware linearization #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −135
Open

crt-lottes and pixellate now use hardware linearization #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 5 additions & 60 deletions crt/crt-lottes.glsl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#version 120

#pragma use_srgb_texture
#pragma use_srgb_framebuffer

// PUBLIC DOMAIN CRT STYLED SCAN-LINE SHADER
//
// by Timothy Lottes
@@ -127,7 +130,6 @@ uniform COMPAT_PRECISION float shape;
#define warpY 0.041
#define maskDark 0.5
#define maskLight 1.5
#define scaleInLinearGamma 1.0
#define shadowMask 3.0
#define brightBoost 1.0
#define hardBloomPix -1.5
@@ -138,71 +140,14 @@ uniform COMPAT_PRECISION float shape;

//Uncomment to reduce instructions with simpler linearization
//(fixes HD3000 Sandy Bridge IGP)
//#define SIMPLE_LINEAR_GAMMA
#define DO_BLOOM

// ------------- //

// sRGB to Linear.
// Assuming using sRGB typed textures this should not be needed.
#ifdef SIMPLE_LINEAR_GAMMA
float ToLinear1(float c)
{
return c;
}
vec3 ToLinear(vec3 c)
{
return c;
}
vec3 ToSrgb(vec3 c)
{
return pow(c, vec3(1.0 / 2.2));
}
#else
float ToLinear1(float c)
{
if (scaleInLinearGamma == 0.)
return c;

return(c<=0.04045) ? c/12.92 : pow((c + 0.055)/1.055, 2.4);
}

vec3 ToLinear(vec3 c)
{
if (scaleInLinearGamma==0.)
return c;

return vec3(ToLinear1(c.r), ToLinear1(c.g), ToLinear1(c.b));
}

// Linear to sRGB.
// Assuming using sRGB typed textures this should not be needed.
float ToSrgb1(float c)
{
if (scaleInLinearGamma == 0.)
return c;

return(c<0.0031308 ? c*12.92 : 1.055*pow(c, 0.41666) - 0.055);
}

vec3 ToSrgb(vec3 c)
{
if (scaleInLinearGamma == 0.)
return c;

return vec3(ToSrgb1(c.r), ToSrgb1(c.g), ToSrgb1(c.b));
}
#endif

// Nearest emulated sample given floating point position and texel offset.
// Also zero's off screen.
vec3 Fetch(vec2 pos,vec2 off){
pos=(floor(pos*SourceSize.xy+off)+vec2(0.5,0.5))/SourceSize.xy;
#ifdef SIMPLE_LINEAR_GAMMA
return ToLinear(brightBoost * pow(COMPAT_TEXTURE(Source,pos.xy).rgb, vec3(2.2)));
#else
return ToLinear(brightBoost * COMPAT_TEXTURE(Source,pos.xy).rgb);
#endif
return brightBoost * COMPAT_TEXTURE(Source,pos.xy).rgb;
}

// Distance in emulated pixels to nearest texel.
@@ -419,6 +364,6 @@ void main()
else
outColor.rgb = vec3(0.0);
#endif
FragColor = vec4(ToSrgb(outColor.rgb), 1.0);
FragColor = vec4(outColor.rgb, 1.0);
}
#endif
70 changes: 5 additions & 65 deletions crt/crt-lottes.tweaked.glsl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#version 120

#pragma use_srgb_texture
#pragma use_srgb_framebuffer

// PUBLIC DOMAIN CRT STYLED SCAN-LINE SHADER
//
// by Timothy Lottes
@@ -22,7 +25,6 @@
#pragma parameter warpY "warpY" 0.041 0.0 0.125 0.01
#pragma parameter maskDark "maskDark" 0.5 0.0 2.0 0.1
#pragma parameter maskLight "maskLight" 1.5 0.0 2.0 0.1
#pragma parameter scaleInLinearGamma "scaleInLinearGamma" 1.0 0.0 1.0 1.0
#pragma parameter shadowMask "shadowMask" 3.0 0.0 4.0 1.0
#pragma parameter brightBoost "brightness boost" 1.0 0.0 2.0 0.05
#pragma parameter hardBloomPix "bloom-x soft" -1.5 -2.0 -0.5 0.1
@@ -113,7 +115,6 @@ uniform COMPAT_PRECISION float warpX;
uniform COMPAT_PRECISION float warpY;
uniform COMPAT_PRECISION float maskDark;
uniform COMPAT_PRECISION float maskLight;
uniform COMPAT_PRECISION float scaleInLinearGamma;
uniform COMPAT_PRECISION float shadowMask;
uniform COMPAT_PRECISION float brightBoost;
uniform COMPAT_PRECISION float hardBloomPix;
@@ -127,7 +128,6 @@ uniform COMPAT_PRECISION float shape;
#define warpY 0.0075 //tweaked
#define maskDark 0.5
#define maskLight 1.5
#define scaleInLinearGamma 1.0
#define shadowMask 1.0
#define brightBoost 1.4 //tweaked
#define hardBloomPix -1.5
@@ -136,73 +136,13 @@ uniform COMPAT_PRECISION float shape;
#define shape 2.0
#endif

//Uncomment to reduce instructions with simpler linearization
//(fixes HD3000 Sandy Bridge IGP)
//#define SIMPLE_LINEAR_GAMMA
#define DO_BLOOM

// ------------- //

// sRGB to Linear.
// Assuming using sRGB typed textures this should not be needed.
#ifdef SIMPLE_LINEAR_GAMMA
float ToLinear1(float c)
{
return c;
}
vec3 ToLinear(vec3 c)
{
return c;
}
vec3 ToSrgb(vec3 c)
{
return pow(c, vec3(1.0 / 2.2));
}
#else
float ToLinear1(float c)
{
if (scaleInLinearGamma == 0.)
return c;

return(c<=0.04045) ? c/12.92 : pow((c + 0.055)/1.055, 2.4);
}

vec3 ToLinear(vec3 c)
{
if (scaleInLinearGamma==0.)
return c;

return vec3(ToLinear1(c.r), ToLinear1(c.g), ToLinear1(c.b));
}

// Linear to sRGB.
// Assuming using sRGB typed textures this should not be needed.
float ToSrgb1(float c)
{
if (scaleInLinearGamma == 0.)
return c;

return(c<0.0031308 ? c*12.92 : 1.055*pow(c, 0.41666) - 0.055);
}

vec3 ToSrgb(vec3 c)
{
if (scaleInLinearGamma == 0.)
return c;

return vec3(ToSrgb1(c.r), ToSrgb1(c.g), ToSrgb1(c.b));
}
#endif

// Nearest emulated sample given floating point position and texel offset.
// Also zero's off screen.
vec3 Fetch(vec2 pos,vec2 off){
pos=(floor(pos*SourceSize.xy+off)+vec2(0.5,0.5))/SourceSize.xy;
#ifdef SIMPLE_LINEAR_GAMMA
return ToLinear(brightBoost * pow(COMPAT_TEXTURE(Source,pos.xy).rgb, vec3(2.2)));
#else
return ToLinear(brightBoost * COMPAT_TEXTURE(Source,pos.xy).rgb);
#endif
return brightBoost * COMPAT_TEXTURE(Source,pos.xy).rgb;
}

// Distance in emulated pixels to nearest texel.
@@ -419,6 +359,6 @@ void main()
else
outColor.rgb = vec3(0.0);
#endif
FragColor = vec4(ToSrgb(outColor.rgb), 1.0);
FragColor = vec4(outColor.rgb, 1.0);
}
#endif
14 changes: 4 additions & 10 deletions interpolation/pixellate.glsl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#version 120

#pragma use_srgb_texture
#pragma use_srgb_framebuffer

// Pixellate Shader
// Copyright (c) 2011, 2012 Fes
// Permission to use, copy, modify, and/or distribute this software for any
@@ -16,8 +19,6 @@
// licence in this forum post:
// http://board.byuu.org/viewtopic.php?p=57295#p57295

#define INTERPOLATE_IN_LINEAR_GAMMA 1.0

uniform vec2 rubyTextureSize;
uniform vec2 rubyInputSize;

@@ -106,13 +107,6 @@ void main()
vec3 bottomLeftColor = COMPAT_TEXTURE(Source, (floor(vec2(left, bottom) / texelSize) + 0.5) * texelSize).rgb;
vec3 topRightColor = COMPAT_TEXTURE(Source, (floor(vec2(right, top) / texelSize) + 0.5) * texelSize).rgb;

if (INTERPOLATE_IN_LINEAR_GAMMA > 0.5){
topLeftColor = pow(topLeftColor, vec3(2.2));
bottomRightColor = pow(bottomRightColor, vec3(2.2));
bottomLeftColor = pow(bottomLeftColor, vec3(2.2));
topRightColor = pow(topRightColor, vec3(2.2));
}

vec2 border = clamp(floor((vTexCoord / texelSize) + vec2(0.5)) * texelSize, vec2(left, bottom), vec2(right, top));

float totalArea = 4.0 * range.x * range.y;
@@ -123,6 +117,6 @@ void main()
averageColor += ((border.x - left) * (border.y - bottom) / totalArea) * bottomLeftColor;
averageColor += ((right - border.x) * (top - border.y) / totalArea) * topRightColor;

FragColor = (INTERPOLATE_IN_LINEAR_GAMMA > 0.5) ? vec4(pow(averageColor, vec3(1.0 / 2.2)), 1.0) : vec4(averageColor, 1.0);
FragColor = vec4(averageColor, 1.0);
}
#endif