diff options
author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-05-20 13:12:37 +0300 |
---|---|---|
committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-05-20 14:12:47 +0300 |
commit | d7bbf9d82e9f129877e6d304b527071155348c59 (patch) | |
tree | 361b362deb1752274112f63890d04c9ae8a0b6d0 /src/Runtime/res/effectlib/distancefieldtext.frag | |
parent | 52092eb06cb659f661d757ae6c2351e58ebbdc1b (diff) |
Copy distance field shader changes to OpenGL runtime
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 <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Runtime/res/effectlib/distancefieldtext.frag')
-rw-r--r-- | src/Runtime/res/effectlib/distancefieldtext.frag | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/Runtime/res/effectlib/distancefieldtext.frag b/src/Runtime/res/effectlib/distancefieldtext.frag index efcf89e4..1d834902 100644 --- a/src/Runtime/res/effectlib/distancefieldtext.frag +++ b/src/Runtime/res/effectlib/distancefieldtext.frag @@ -1,12 +1,28 @@ +#ifdef GL_OES_standard_derivatives +# extension GL_OES_standard_derivatives : enable +#else +# define use_fallback +#endif + varying highp vec2 sampleCoord; -varying highp vec2 alphas; uniform sampler2D _qt_texture; uniform highp vec4 color; +#ifdef use_fallback +varying highp vec2 alphas; +#endif + void main() { - gl_FragColor = color * smoothstep(alphas.x, - alphas.y, - texture2D(_qt_texture, sampleCoord).a); + highp float distance = texture2D(_qt_texture, sampleCoord).a; + +#ifdef use_fallback + highp float alpha = smoothstep(alphas.x, alphas.y, distance); +#else + highp float f = fwidth(distance); + highp float alpha = smoothstep(0.5 - f, 0.5, distance); +#endif + + gl_FragColor = color * alpha; } |