alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix FadingMaterial fragment with core profile

Browse Source 
Summary:
Currently it asserts. I'm sure it worked at some point.
Fixed to match shaders shipped with Qt.

Test Plan:
Set Core profile
Did crash
Now doesn't

Reviewers: #plasma

Subscribers: #frameworks

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D11090
This commit is contained in:
David Edmundson 2018-03-06 11:02:59 +00:00
parent 8019cb369c
commit 188be131bc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/declarativeimports/core/fadingmaterial_core.frag
View File

@ -1,5 +1,6 @@
#version 150 core
in highp vec2 v_coord;
out vec4 fragColor;
uniform sampler2D u_src;
uniform sampler2D u_target;
uniform highp float u_transitionProgress;
@ -7,5 +8,5 @@ uniform lowp float qt_Opacity;
void main() {
lowp vec4 tex1 = texture2D(u_target, v_coord);
lowp vec4 tex2 = texture2D(u_src, v_coord);
gl_FragColor = mix(tex2, tex1, u_transitionProgress) * qt_Opacity;
fragColor = mix(tex2, tex1, u_transitionProgress) * qt_Opacity;
}