From 188be131bca5a37ecf6305484752107dab4d1642 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Tue, 6 Mar 2018 11:02:59 +0000 Subject: [PATCH] Fix FadingMaterial fragment with core profile 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 --- src/declarativeimports/core/fadingmaterial_core.frag | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/declarativeimports/core/fadingmaterial_core.frag b/src/declarativeimports/core/fadingmaterial_core.frag index 18c169402..e3611cf98 100644 --- a/src/declarativeimports/core/fadingmaterial_core.frag +++ b/src/declarativeimports/core/fadingmaterial_core.frag @@ -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; }