Merge 89d6c622cd into a283c34dbb

edit coding sleep deprived is not a good idea those werent edge cases
those where important parts of the code
2024-08-17 16:20:23 +03:00 · 2024-07-10 21:29:06 +00:00 · 2024-07-10 23:23:42 +02:00 · 2024-07-10 23:17:39 +02:00
1 changed files with 4 additions and 3 deletions
--- a/src/render_helpers/shaders/border.frag
+++ b/src/render_helpers/shaders/border.frag
@ -98,14 +98,15 @@ vec3 oklab_to_linear(vec3 color){

 vec4 color_mix(vec4 color1, vec4 color2, float color_ratio) {
  //  srgb
+  
  if (colorspace == 0.0) {
    return mix(color1, color2, color_ratio);
  }
  
  vec4 color_out;

-  color1.rgb /= color1.a;
-  color2.rgb /= color2.a;
+  color1.rgb /= color1.a != 0.0 ? color1.a : 1.0;
+  color2.rgb /= color2.a != 0.0 ? color2.a : 1.0;
  
  color1.rgb = vec3(
    srgb_to_linear(color1.r),
@ -183,7 +184,7 @@ vec4 color_mix(vec4 color1, vec4 color2, float color_ratio) {
  }

  return vec4(
-    linear_to_srgb(color_out.r) * color_out.a ,
+    linear_to_srgb(color_out.r) * color_out.a,
    linear_to_srgb(color_out.g) * color_out.a,
    linear_to_srgb(color_out.b) * color_out.a,
    color_out.a
Author	SHA1	Message	Date
Kiko	8e60b4f5ce	Merge `89d6c622cd` into `a283c34dbb`	2024-07-10 21:29:06 +00:00
K's Thinkpad	89d6c622cd	edit coding sleep deprived is not a good idea those werent edge cases those where important parts of the code	2024-07-10 23:23:42 +02:00
K's Thinkpad	31da555f54	filtered out edgecases in the shader	2024-07-10 23:17:39 +02:00