yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.15'

Browse source
This commit is contained in:
Kai Uwe Broulik 2019-02-05 13:28:56 +01:00
commit f86d70aa63
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
effects/shaders.qrc
View file

@ -7,7 +7,7 @@
<file alias="sphere.vert">cube/data/1.10/sphere.vert</file> <file alias="sphere.vert">cube/data/1.10/sphere.vert</file>
<file alias="invert.frag">invert/data/1.10/invert.frag</file> <file alias="invert.frag">invert/data/1.10/invert.frag</file>
<file alias="lookingglass.frag">lookingglass/data/1.10/lookingglass.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>
<qresource prefix="/effect-shaders-1.40"> <qresource prefix="/effect-shaders-1.40">
<file alias="coverswitch-reflection.glsl">coverswitch/shaders/1.40/coverswitch-reflection.glsl</file> <file alias="coverswitch-reflection.glsl">coverswitch/shaders/1.40/coverswitch-reflection.glsl</file>
@ -17,6 +17,7 @@
<file alias="sphere.vert">cube/data/1.40/sphere.vert</file> <file alias="sphere.vert">cube/data/1.40/sphere.vert</file>
<file alias="invert.frag">invert/data/1.40/invert.frag</file> <file alias="invert.frag">invert/data/1.40/invert.frag</file>
<file alias="lookingglass.frag">lookingglass/data/1.40/lookingglass.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> </qresource>
</RCC> </RCC>

0
effects/startupfeedback/data/blinking-startup-fragment.glsl → effects/startupfeedback/data/1.10/blinking-startup-fragment.glsl
View file

16
effects/startupfeedback/data/1.40/blinking-startup-fragment.glsl Normal file
View file

@ -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;
}