yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugins/colorblindnesscorrection: Ensure that error and correction are fully initialized

Browse source 
vec3() will complain if the vector is not fully initialized. Also if the
type of these variables is changed to vec4 and some miss alpha values,
the glsl compiler will complain again.
This commit is contained in:
Vlad Zahorodnii 2024-01-19 13:17:44 +02:00
parent 4cc94e9462
commit 7e8230a596
6 changed files with 36 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/plugins/colorblindnesscorrection/shaders/Deutranopia.frag
View file

@ -24,15 +24,13 @@ void main()
float m = 0.494207 * L + 0.0 * M + 1.24827 * S;
float s = 0.0 * L + 0.0 * M + 1.0 * S;
vec3 error;
error.r = (0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s);
error.g = (-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s);
error.b = (-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s);
vec3 error = vec3((0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s),
(-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s),
(-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s));
vec3 diff = tex.rgb - error;
vec3 correction;
correction.r = 0.0;
correction.g = (diff.r * 0.7) + (diff.g * 1.0);
correction.b = (diff.r * 0.7) + (diff.b * 1.0);
vec3 correction = vec3(0.0,
(diff.r * 0.7) + (diff.g * 1.0),
(diff.r * 0.7) + (diff.b * 1.0));
gl_FragColor = (tex + vec4(correction, 0.0)) * modulation;
}

14
src/plugins/colorblindnesscorrection/shaders/Deutranopia_core.frag
View file

@ -27,15 +27,13 @@ void main()
float m = 0.494207 * L + 0.0 * M + 1.24827 * S;
float s = 0.0 * L + 0.0 * M + 1.0 * S;
vec3 error;
error.r = (0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s);
error.g = (-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s);
error.b = (-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s);
vec3 error = vec3((0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s),
(-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s),
(-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s));
vec3 diff = tex.rgb - error;
vec3 correction;
correction.r = 0.0;
correction.g = (diff.r * 0.7) + (diff.g * 1.0);
correction.b = (diff.r * 0.7) + (diff.b * 1.0);
vec3 correction = vec3(0.0,
(diff.r * 0.7) + (diff.g * 1.0),
(diff.r * 0.7) + (diff.b * 1.0));
fragColor = (tex + vec4(correction, 0.0)) * modulation;
}

14
src/plugins/colorblindnesscorrection/shaders/Protanopia.frag
View file

@ -24,15 +24,13 @@ void main()
float m = 0.0 * L + 1.0 * M + 0.0 * S;
float s = 0.0 * L + 0.0 * M + 1.0 * S;
vec3 error;
error.r = (0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s);
error.g = (-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s);
error.b = (-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s);
vec3 error = vec3((0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s),
(-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s),
(-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s));
vec3 diff = tex.rgb - error;
vec3 correction;
correction.r = 0.0;
correction.g = (diff.r * 0.7) + (diff.g * 1.0);
correction.b = (diff.r * 0.7) + (diff.b * 1.0);
vec3 correction = vec3(0.0,
(diff.r * 0.7) + (diff.g * 1.0),
(diff.r * 0.7) + (diff.b * 1.0));
gl_FragColor = (tex + vec4(correction, 0.0)) * modulation;
}

14
src/plugins/colorblindnesscorrection/shaders/Protanopia_core.frag
View file

@ -27,15 +27,13 @@ void main()
float m = 0.0 * L + 1.0 * M + 0.0 * S;
float s = 0.0 * L + 0.0 * M + 1.0 * S;
vec3 error;
error.r = (0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s);
error.g = (-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s);
error.b = (-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s);
vec3 error = vec3((0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s),
(-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s),
(-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s));
vec3 diff = tex.rgb - error;
vec3 correction;
correction.r = 0.0;
correction.g = (diff.r * 0.7) + (diff.g * 1.0);
correction.b = (diff.r * 0.7) + (diff.b * 1.0);
vec3 correction = vec3(0.0,
(diff.r * 0.7) + (diff.g * 1.0),
(diff.r * 0.7) + (diff.b * 1.0));
fragColor = (tex + vec4(correction, 0.0)) * modulation;
}

14
src/plugins/colorblindnesscorrection/shaders/Tritanopia.frag
View file

@ -24,15 +24,13 @@ void main()
float m = 0.0 * L + 1.0 * M + 0.0 * S;
float s = -0.395913 * L + 0.801109 * M + 0.0 * S;
vec3 error;
error.r = (0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s);
error.g = (-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s);
error.b = (-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s);
vec3 error = vec3((0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s),
(-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s),
(-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s));
vec3 diff = tex.rgb - error;
vec3 correction;
correction.r = 0.0;
correction.g = (diff.r * 0.7) + (diff.g * 1.0);
correction.b = (diff.r * 0.7) + (diff.b * 1.0);
vec3 correction = vec3(0.0,
(diff.r * 0.7) + (diff.g * 1.0),
(diff.r * 0.7) + (diff.b * 1.0));
gl_FragColor = (tex + vec4(correction, 0.0)) * modulation;
}

14
src/plugins/colorblindnesscorrection/shaders/Tritanopia_core.frag
View file

@ -27,15 +27,13 @@ void main()
float m = 0.0 * L + 1.0 * M + 0.0 * S;
float s = -0.395913 * L + 0.801109 * M + 0.0 * S;
vec3 error;
error.r = (0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s);
error.g = (-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s);
error.b = (-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s);
vec3 error = vec3((0.0809444479 * l) + (-0.130504409 * m) + (0.116721066 * s),
(-0.0102485335 * l) + (0.0540193266 * m) + (-0.113614708 * s),
(-0.000365296938 * l) + (-0.00412161469 * m) + (0.693511405 * s));
vec3 diff = tex.rgb - error;
vec3 correction;
correction.r = 0.0;
correction.g = (diff.r * 0.7) + (diff.g * 1.0);
correction.b = (diff.r * 0.7) + (diff.b * 1.0);
vec3 correction = vec3(0.0,
(diff.r * 0.7) + (diff.g * 1.0),
(diff.r * 0.7) + (diff.b * 1.0));
fragColor = (tex + vec4(correction, 0.0)) * modulation;
}