diff options
author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-06-21 14:53:47 -0700 |
---|---|---|
committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2017-06-21 14:53:47 -0700 |
commit | d2a2ef24343ce3fe9401347c7c9905c57fbffb7a (patch) | |
tree | 3542a49b9c6684f4d4ead2872eb5b5baed561185 | |
parent | f8bc6d1241cd5c630f9c5e49ab2a2b90b01507c4 (diff) | |
download | qtlocation-mapboxgl-upstream/remove-unpremultiply.tar.gz |
Unpremultiply both color0 and color1upstream/remove-unpremultiply
-rw-r--r-- | src/mbgl/shaders/raster.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mbgl/shaders/raster.cpp b/src/mbgl/shaders/raster.cpp index e7739b4738..3bdf8b23d7 100644 --- a/src/mbgl/shaders/raster.cpp +++ b/src/mbgl/shaders/raster.cpp @@ -46,11 +46,15 @@ void main() { vec4 color0 = texture2D(u_image0, v_pos0); vec4 color1 = texture2D(u_image1, v_pos1); vec4 color = mix(color0, color1, u_fade_t); + if (color0.a > 0.0) { + color0.rgb = color0.rgb / color0.a; + } + if (color1.a > 0.0) { + color1.rgb = color1.rgb / color1.a; + } + color.a *= u_opacity; vec3 rgb = color.rgb; - if (color.a > 0.0) { - rgb = color.rgb / color.a; - } // spin rgb = vec3( |