diff --git a/effects/shaders.qrc b/effects/shaders.qrc index cf19e34c8..5d91b0c81 100644 --- a/effects/shaders.qrc +++ b/effects/shaders.qrc @@ -1,24 +1,25 @@ coverswitch/shaders/1.10/coverswitch-reflection.glsl cube/data/1.10/cube-cap.glsl cube/data/1.10/cube-reflection.glsl cube/data/1.10/cylinder.vert cube/data/1.10/sphere.vert invert/data/1.10/invert.frag logout/data/1.10/logout-blur.frag lookingglass/data/1.10/lookingglass.frag - startupfeedback/data/blinking-startup-fragment.glsl + startupfeedback/data/1.10/blinking-startup-fragment.glsl coverswitch/shaders/1.40/coverswitch-reflection.glsl cube/data/1.40/cube-cap.glsl cube/data/1.40/cube-reflection.glsl cube/data/1.40/cylinder.vert cube/data/1.40/sphere.vert invert/data/1.40/invert.frag logout/data/1.40/logout-blur.frag lookingglass/data/1.40/lookingglass.frag + startupfeedback/data/1.40/blinking-startup-fragment.glsl diff --git a/effects/startupfeedback/data/blinking-startup-fragment.glsl b/effects/startupfeedback/data/1.10/blinking-startup-fragment.glsl similarity index 100% copy from effects/startupfeedback/data/blinking-startup-fragment.glsl copy to effects/startupfeedback/data/1.10/blinking-startup-fragment.glsl diff --git a/effects/startupfeedback/data/blinking-startup-fragment.glsl b/effects/startupfeedback/data/1.40/blinking-startup-fragment.glsl similarity index 52% rename from effects/startupfeedback/data/blinking-startup-fragment.glsl rename to effects/startupfeedback/data/1.40/blinking-startup-fragment.glsl index 3229f5802..88c721999 100644 --- a/effects/startupfeedback/data/blinking-startup-fragment.glsl +++ b/effects/startupfeedback/data/1.40/blinking-startup-fragment.glsl @@ -1,13 +1,16 @@ +#version 140 uniform sampler2D sampler; uniform vec4 geometryColor; -varying vec2 texcoord0; +in vec2 texcoord0; + +out vec4 fragColor; void main() { - vec4 tex = texture2D(sampler, texcoord0); + vec4 tex = texture(sampler, texcoord0); if (tex.a != 1.0) { tex = geometryColor; } - gl_FragColor = tex; + fragColor = tex; }