Correct default blend mode, fix solid stroke shader to respect premul…

…tiplied source colors (flutter#69)
dnfield · Mar 10, 2022 · a91403f · a91403f
1 parent 5e12e7d
commit a91403f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/impeller/entity/contents/content_context.h b/impeller/entity/contents/content_context.h
@@ -40,7 +40,7 @@ using ClipPipeline = PipelineT<SolidFillVertexShader, SolidFillFragmentShader>;
 
 struct ContentContextOptions {
   SampleCount sample_count = SampleCount::kCount1;
-  Entity::BlendMode blend_mode = Entity::BlendMode::kSource;
+  Entity::BlendMode blend_mode = Entity::BlendMode::kSourceOver;
 
   struct Hash {
     constexpr std::size_t operator()(const ContentContextOptions& o) const {

diff --git a/impeller/entity/shaders/solid_stroke.frag b/impeller/entity/shaders/solid_stroke.frag
@@ -8,6 +8,5 @@ in float v_pen_down;
 out vec4 frag_color;
 
 void main() {
-  frag_color = stroke_color;
-  frag_color.a *= floor(v_pen_down);
+  frag_color = stroke_color * floor(v_pen_down);
 }