Commit c1fa9a18 authored by hunterk's avatar hunterk
Browse files

more GLES nits

parent 0edf6ab7
......@@ -137,6 +137,6 @@ mat4 adjust = mat4((1.0 - sat) * 0.3086 + sat, (1.0 - sat) * 0.3086, (1.0 - sat)
color *= adjust;
screen = clamp(screen * lum, 0.0, 1.0);
screen = color * screen;
FragColor = pow(screen, vec4(1.0 / display_gamma + (darken_screen / 8)));
FragColor = pow(screen, vec4(1.0 / display_gamma + (darken_screen / 8.)));
}
#endif
......@@ -135,11 +135,11 @@ COMPAT_VARYING vec4 TEX0;
#define fetch_offset(coord, offset) (pow(vec3(gain) * texelFetchOffset(Source, (coord), 0, (offset)).rgb + vec3(blacklevel), vec3(gamma)) + vec3(ambient))
// integral of (1 - x^2 - x^4 + x^6)^2
COMPAT_PRECISION float coeffs_x[7] = float[](1.0, -2.0/3.0, -1.0/5.0, 4.0/7.0, -1.0/9.0, -2.0/11.0, 1.0/13.0);
float coeffs_x[7] = float[](1.0, -2.0/3.0, -1.0/5.0, 4.0/7.0, -1.0/9.0, -2.0/11.0, 1.0/13.0);
// integral of (1 - 2x^4 + x^6)^2
COMPAT_PRECISION float coeffs_y[7] = float[](1.0, 0.0, -4.0/5.0, 2.0/7.0, 4.0/9.0, -4.0/11.0, 1.0/13.0);
float coeffs_y[7] = float[](1.0, 0.0, -4.0/5.0, 2.0/7.0, 4.0/9.0, -4.0/11.0, 1.0/13.0);
COMPAT_PRECISION float intsmear_func(float z, float coeffs[7])
float intsmear_func(float z, float coeffs[7])
{
float z2 = z*z;
float zn = z;
......@@ -151,7 +151,7 @@ COMPAT_PRECISION float intsmear_func(float z, float coeffs[7])
return ret;
}
COMPAT_PRECISION float intsmear(float x, float dx, float d, float coeffs[7])
float intsmear(float x, float dx, float d, float coeffs[7])
{
float zl = clamp((x-dx*0.5)/d,-1.0,1.0);
float zh = clamp((x+dx*0.5)/d,-1.0,1.0);
......@@ -162,7 +162,7 @@ void main()
{
vec2 texelSize = SourceSize.zw;
/* float2 range = IN.video_size / (IN.output_size * IN.texture_size); */
vec2 range = outsize.zw;
vec2 range = InputSize.xy / (OutputSize.xy * TextureSize.xy);//outsize.zw;
vec3 cred = pow(vec3(RSUBPIX_R, RSUBPIX_G, RSUBPIX_B), vec3(outgamma));
vec3 cgreen = pow(vec3(GSUBPIX_R, GSUBPIX_G, GSUBPIX_B), vec3(outgamma));
......
......@@ -137,7 +137,7 @@ struct input_dummy {
vec2 _video_size;
vec2 VARtexture_size;
vec2 _output_dummy_size;
float _frame_count;
int _frame_count;
float _frame_direction;
float _frame_rotation;
float _placeholder74;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment