gl renderer: Shorten shaders a bit

diff --git a/gsk/resources/glsl/preamble.fs.glsl b/gsk/resources/glsl/preamble.fs.glsl
index b5c958ebf1987f42c648019eff9dcacdfda68ecb..5107470e00aa9f07c92fe79460b885ff62ac861b 100644 (file)
--- a/gsk/resources/glsl/preamble.fs.glsl
+++ b/gsk/resources/glsl/preamble.fs.glsl
@@ -77,9 +77,7 @@ rounded_rect_coverage (RoundedRect r, vec2 p)
 }
 
 vec4 Texture(sampler2D sampler, vec2 texCoords) {
-#if GSK_GLES
-  return texture2D(sampler, texCoords);
-#elif GSK_LEGACY
+#if defined(GSK_GLES) || defined(GSK_LEGACY)
   return texture2D(sampler, texCoords);
 #else
   return texture(sampler, texCoords);
@@ -95,9 +93,7 @@ void setOutputColor(vec4 color) {
 
   // We do *NOT* transform the clip rect here since we already
   // need to do that on the CPU.
-#if GSK_GLES
-  gl_FragColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy);
-#elif GSK_LEGACY
+#if defined(GSK_GLES) || defined(GSK_LEGACY)
   gl_FragColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy);
 #else
   outputColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy);

diff --git a/gsk/resources/glsl/preamble.vs.glsl b/gsk/resources/glsl/preamble.vs.glsl
index 1dc4a5e7bf701ab148e7f3a56dd8f0f222dcc4e3..76de2d656140f7dda5ce517937663d710ccf3db0 100644 (file)
--- a/gsk/resources/glsl/preamble.vs.glsl
+++ b/gsk/resources/glsl/preamble.vs.glsl
@@ -2,11 +2,7 @@ uniform mat4 u_projection;
 uniform mat4 u_modelview;
 uniform float u_alpha;
 
-#if GSK_GLES
-attribute vec2 aPosition;
-attribute vec2 aUv;
-_OUT_ vec2 vUv;
-#elif GSK_LEGACY
+#if defined(GSK_GLES) || defined(GSK_LEGACY)
 attribute vec2 aPosition;
 attribute vec2 aUv;
 _OUT_ vec2 vUv;