From d7bbf9d82e9f129877e6d304b527071155348c59 Mon Sep 17 00:00:00 2001 From: Jere Tuliniemi Date: Mon, 20 May 2019 13:12:37 +0300 Subject: Copy distance field shader changes to OpenGL runtime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fixes the OpenGL runtime to use alpha channel for the glyph texture when using ES2. Task-number: QT3DS-3343 Change-Id: Ia37c341802e504da21ebeaff6f3f1f5b50bd1bfe Reviewed-by: Mahmoud Badri Reviewed-by: Miikka Heikkinen Reviewed-by: Antti Määttä --- src/Runtime/res/effectlib/distancefieldtext_core.frag | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/Runtime/res/effectlib/distancefieldtext_core.frag') diff --git a/src/Runtime/res/effectlib/distancefieldtext_core.frag b/src/Runtime/res/effectlib/distancefieldtext_core.frag index 0f848bc1..bf60f874 100644 --- a/src/Runtime/res/effectlib/distancefieldtext_core.frag +++ b/src/Runtime/res/effectlib/distancefieldtext_core.frag @@ -5,10 +5,9 @@ out vec4 fragColor; uniform sampler2D _qt_texture; uniform vec4 color; -in vec2 alphas; - void main() { - fragColor = color * smoothstep(alphas.x, alphas.y, - texture(_qt_texture, sampleCoord).r); + float distance = texture(_qt_texture, sampleCoord).r; + float f = fwidth(distance); + fragColor = color * smoothstep(0.5 - f, 0.5, distance); } -- cgit v1.2.3