From a7532b684f4fb0e1ca63d33e8f60d5f6857aa7d2 Mon Sep 17 00:00:00 2001 From: Sergey Chupligin Date: Wed, 25 Oct 2023 17:15:53 +0300 Subject: [PATCH] [NemoIcon] Fixup fragment --- src/controls/qml/NemoIcon.qml | 2 +- src/controls/qml/shaders/NemoIcon.frag | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/controls/qml/NemoIcon.qml b/src/controls/qml/NemoIcon.qml index 3f6b115..67b5f42 100644 --- a/src/controls/qml/NemoIcon.qml +++ b/src/controls/qml/NemoIcon.qml @@ -38,7 +38,7 @@ Image { layer.effect: ShaderEffect { id: shaderItem - property color tint: nemoIcon.color + property color color: nemoIcon.color property variant source: nemoIcon fragmentShader: "shaders/NemoIcon.frag.qsb" } diff --git a/src/controls/qml/shaders/NemoIcon.frag b/src/controls/qml/shaders/NemoIcon.frag index bc8067c..acf67ac 100644 --- a/src/controls/qml/shaders/NemoIcon.frag +++ b/src/controls/qml/shaders/NemoIcon.frag @@ -8,13 +8,12 @@ layout(binding = 1) uniform sampler2D source; layout(std140, binding = 0) uniform buf { mat4 qt_Matrix; float qt_Opacity; - vec4 tint; + + vec4 color; } ubuf; void main() { vec4 c = texture(source, qt_TexCoord0); - float lo = min(min(c.x, c.y), c.z); - float hi = max(max(c.x, c.y), c.z); - fragColor = ubuf.qt_Opacity * vec4(mix(vec3(lo), vec3(hi), ubuf.tint.xyz), c.w); + fragColor = c * ubuf.color * ubuf.qt_Opacity; }