Clean up glsl code

egui_glow/src/shader/fragment.glsl

@@ -1,52 +1,59 @@
 #ifdef GL_ES
-precision mediump float;
+    precision mediump float;
 #endif
 
 uniform sampler2D u_sampler;
 
 #ifdef NEW_SHADER_INTERFACE
-in vec4 v_rgba;
+    in vec4 v_rgba;
-in vec2 v_tc;
+    in vec2 v_tc;
-out vec4 f_color;
+    out vec4 f_color;
-// a dirty hack applied to support webGL2
+    // a dirty hack applied to support webGL2
-#define gl_FragColor f_color
+    #define gl_FragColor f_color
-#define texture2D texture
+    #define texture2D texture
 #else
-varying vec4 v_rgba;
+    varying vec4 v_rgba;
-varying vec2 v_tc;
+    varying vec2 v_tc;
 #endif
 
-#ifndef SRGB_SUPPORTED
+#ifdef SRGB_SUPPORTED
-// 0-255 sRGB  from  0-1 linear
+    void main() {
-vec3 srgb_from_linear(vec3 rgb) {
+        // The texture sampler is sRGB aware, and OpenGL already expects linear rgba output
+        // so no need for any sRGB conversions here:
+        gl_FragColor = v_rgba * texture2D(u_sampler, v_tc);
+    }
+#else
+    // 0-255 sRGB  from  0-1 linear
+    vec3 srgb_from_linear(vec3 rgb) {
         bvec3 cutoff = lessThan(rgb, vec3(0.0031308));
         vec3 lower = rgb * vec3(3294.6);
         vec3 higher = vec3(269.025) * pow(rgb, vec3(1.0 / 2.4)) - vec3(14.025);
         return mix(higher, lower, vec3(cutoff));
-}
+    }
 
-vec4 srgba_from_linear(vec4 rgba) {
+    vec4 srgba_from_linear(vec4 rgba) {
         return vec4(srgb_from_linear(rgba.rgb), 255.0 * rgba.a);
-}
+    }
-// 0-1 linear  from  0-255 sRGB
+
-vec3 linear_from_srgb(vec3 srgb) {
+    // 0-1 linear  from  0-255 sRGB
+    vec3 linear_from_srgb(vec3 srgb) {
         bvec3 cutoff = lessThan(srgb, vec3(10.31475));
         vec3 lower = srgb / vec3(3294.6);
         vec3 higher = pow((srgb + vec3(14.025)) / vec3(269.025), vec3(2.4));
         return mix(higher, lower, vec3(cutoff));
-}
+    }
 
-vec4 linear_from_srgba(vec4 srgba) {
+    vec4 linear_from_srgba(vec4 srgba) {
         return vec4(linear_from_srgb(srgba.rgb), srgba.a / 255.0);
-}
+    }
 
-void main() {
+    void main() {
-    // We must decode the colors, since WebGL doesn't come with sRGBA textures:
+        // We must decode the colors, since WebGL1 doesn't come with sRGBA textures:
         vec4 texture_rgba = linear_from_srgba(texture2D(u_sampler, v_tc) * 255.0);
         /// Multiply vertex color with texture color (in linear space).
         gl_FragColor = v_rgba * texture_rgba;
 
-    // WebGL doesn't support linear blending in the framebuffer,
+        // WebGL1 doesn't support linear blending in the framebuffer,
         // so we do a hack here where we change the premultiplied alpha
         // to do the multiplication in gamma space instead:
 
@@ -65,13 +72,5 @@ void main() {
         if (gl_FragColor.a > 0.0) {
             gl_FragColor.rgb *= gl_FragColor.a;
         }
-}
+    }
-    #else
+#endif
-void main() {
-    // The texture sampler is sRGB aware, and OpenGL already expects linear rgba output
-    // so no need for any sRGB conversions here:
-
-    gl_FragColor = v_rgba * texture2D(u_sampler, v_tc);
-
-}
-    #endif

egui_glow/src/shader/vertex.glsl

@@ -1,16 +1,17 @@
 #ifdef NEW_SHADER_INTERFACE
-#define I in
+    #define I in
-#define O out
+    #define O out
-#define V(x) x
+    #define V(x) x
 #else
-#define I attribute
+    #define I attribute
-#define O varying
+    #define O varying
-#define V(x) vec3(x)
+    #define V(x) vec3(x)
 #endif
 
 #ifdef GL_ES
-precision mediump float;
+    precision mediump float;
 #endif
+
 uniform vec2 u_screen_size;
 I vec2 a_pos;
 I vec4 a_srgba; // 0-255 sRGB
@@ -36,7 +37,7 @@ void main() {
                       1.0 - 2.0 * a_pos.y / u_screen_size.y,
                       0.0,
                       1.0);
-  // egui encodes vertex colors in gamma spaces, so we must decode the colors here:
+    // egui encodes vertex colors in gamma space, so we must decode the colors here:
     v_rgba = linear_from_srgba(a_srgba);
     v_tc = a_tc;
 }