From bc5978b75944895db2c49c2ed0e032527024bef4 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Tue, 5 Feb 2019 13:28:14 +0100
Subject: [PATCH] [effects/startupfeedback] Fix shader

Provide both 1.10 and 1.40 shaders.

Differential Revision: https://phabricator.kde.org/D18757
---
 effects/shaders.qrc                              |  3 ++-
 .../{ => 1.10}/blinking-startup-fragment.glsl    |  0
 .../data/1.40/blinking-startup-fragment.glsl     | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 rename effects/startupfeedback/data/{ => 1.10}/blinking-startup-fragment.glsl (100%)
 create mode 100644 effects/startupfeedback/data/1.40/blinking-startup-fragment.glsl

diff --git a/effects/shaders.qrc b/effects/shaders.qrc
index cf19e34c8b..5d91b0c81d 100644
--- a/effects/shaders.qrc
+++ b/effects/shaders.qrc
@@ -8,7 +8,7 @@
   <file alias="invert.frag">invert/data/1.10/invert.frag</file>
   <file alias="logout-blur.frag">logout/data/1.10/logout-blur.frag</file>
   <file alias="lookingglass.frag">lookingglass/data/1.10/lookingglass.frag</file>
-  <file alias="blinking-startup-fragment.glsl">startupfeedback/data/blinking-startup-fragment.glsl</file>
+  <file alias="blinking-startup-fragment.glsl">startupfeedback/data/1.10/blinking-startup-fragment.glsl</file>
 </qresource>
 <qresource prefix="/effect-shaders-1.40">
   <file alias="coverswitch-reflection.glsl">coverswitch/shaders/1.40/coverswitch-reflection.glsl</file>
@@ -19,6 +19,7 @@
   <file alias="invert.frag">invert/data/1.40/invert.frag</file>
   <file alias="logout-blur.frag">logout/data/1.40/logout-blur.frag</file>
   <file alias="lookingglass.frag">lookingglass/data/1.40/lookingglass.frag</file>
+  <file alias="blinking-startup-fragment.glsl">startupfeedback/data/1.40/blinking-startup-fragment.glsl</file>
 </qresource>
 </RCC>
 
diff --git a/effects/startupfeedback/data/blinking-startup-fragment.glsl b/effects/startupfeedback/data/1.10/blinking-startup-fragment.glsl
similarity index 100%
rename from effects/startupfeedback/data/blinking-startup-fragment.glsl
rename to effects/startupfeedback/data/1.10/blinking-startup-fragment.glsl
diff --git a/effects/startupfeedback/data/1.40/blinking-startup-fragment.glsl b/effects/startupfeedback/data/1.40/blinking-startup-fragment.glsl
new file mode 100644
index 0000000000..88c721999b
--- /dev/null
+++ b/effects/startupfeedback/data/1.40/blinking-startup-fragment.glsl
@@ -0,0 +1,16 @@
+#version 140
+uniform sampler2D sampler;
+uniform vec4 geometryColor;
+
+in vec2 texcoord0;
+
+out vec4 fragColor;
+
+void main()
+{
+    vec4 tex = texture(sampler, texcoord0);
+    if (tex.a != 1.0) {
+        tex = geometryColor;
+    }
+    fragColor = tex;
+}