[Impeller] Unconditionally dither in gradient shader fragments. (#46746)

Partial work towards flutter/flutter#112498. Won't land this until #46745 is merged, so expect some redness until then.
flutter · Oct 24, 2023 · fb15e04 · fb15e04
1 parent 8fdf7df
commit fb15e04
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 90 deletions.
diff --git a/impeller/aiks/color_source.cc b/impeller/aiks/color_source.cc
@@ -59,7 +59,6 @@ ColorSource ColorSource::MakeLinearGradient(Point start_point,
     contents->SetStops(stops);
     contents->SetEndPoints(start_point, end_point);
     contents->SetTileMode(tile_mode);
-    contents->SetDither(paint.dither);
     contents->SetEffectTransform(effect_transform);
 
     std::vector<Point> bounds{start_point, end_point};
@@ -92,7 +91,6 @@ ColorSource ColorSource::MakeConicalGradient(Point center,
     contents->SetStops(stops);
     contents->SetCenterAndRadius(center, radius);
     contents->SetTileMode(tile_mode);
-    contents->SetDither(paint.dither);
     contents->SetEffectTransform(effect_transform);
     contents->SetFocus(focus_center, focus_radius);
 
@@ -124,7 +122,6 @@ ColorSource ColorSource::MakeRadialGradient(Point center,
     contents->SetStops(stops);
     contents->SetCenterAndRadius(center, radius);
     contents->SetTileMode(tile_mode);
-    contents->SetDither(paint.dither);
     contents->SetEffectTransform(effect_transform);
 
     auto radius_pt = Point(radius, radius);
@@ -156,7 +153,6 @@ ColorSource ColorSource::MakeSweepGradient(Point center,
     contents->SetColors(colors);
     contents->SetStops(stops);
     contents->SetTileMode(tile_mode);
-    contents->SetDither(paint.dither);
     contents->SetEffectTransform(effect_transform);
 
     return contents;

diff --git a/impeller/entity/contents/conical_gradient_contents.cc b/impeller/entity/contents/conical_gradient_contents.cc
@@ -29,10 +29,6 @@ void ConicalGradientContents::SetTileMode(Entity::TileMode tile_mode) {
   tile_mode_ = tile_mode;
 }
 
-void ConicalGradientContents::SetDither(bool dither) {
-  dither_ = dither;
-}
-
 void ConicalGradientContents::SetColors(std::vector<Color> colors) {
   colors_ = std::move(colors);
 }
@@ -76,7 +72,6 @@ bool ConicalGradientContents::RenderSSBO(const ContentContext& renderer,
   frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
   frag_info.decal_border_color = decal_border_color_;
   frag_info.alpha = GetOpacityFactor();
-  frag_info.dither = dither_;
   if (focus_) {
     frag_info.focus = focus_.value();
     frag_info.focus_radius = focus_radius_;

diff --git a/impeller/entity/contents/conical_gradient_contents.h b/impeller/entity/contents/conical_gradient_contents.h
@@ -45,8 +45,6 @@ class ConicalGradientContents final : public ColorSourceContents {
 
   void SetTileMode(Entity::TileMode tile_mode);
 
-  void SetDither(bool dither);
-
   void SetFocus(std::optional<Point> focus, Scalar radius);
 
  private:
@@ -65,7 +63,6 @@ class ConicalGradientContents final : public ColorSourceContents {
   Color decal_border_color_ = Color::BlackTransparent();
   std::optional<Point> focus_;
   Scalar focus_radius_ = 0.0f;
-  bool dither_ = false;
 
   FML_DISALLOW_COPY_AND_ASSIGN(ConicalGradientContents);
 };

diff --git a/impeller/entity/contents/linear_gradient_contents.cc b/impeller/entity/contents/linear_gradient_contents.cc
@@ -56,10 +56,6 @@ bool LinearGradientContents::IsOpaque() const {
   return true;
 }
 
-void LinearGradientContents::SetDither(bool dither) {
-  dither_ = dither;
-}
-
 bool LinearGradientContents::Render(const ContentContext& renderer,
                                     const Entity& entity,
                                     RenderPass& pass) const {
@@ -150,7 +146,6 @@ bool LinearGradientContents::RenderSSBO(const ContentContext& renderer,
   auto colors = CreateGradientColors(colors_, stops_);
 
   frag_info.colors_length = colors.size();
-  frag_info.dither = dither_;
   auto color_buffer =
       host_buffer.Emplace(colors.data(), colors.size() * sizeof(StopData),
                           DefaultUniformAlignment());

diff --git a/impeller/entity/contents/linear_gradient_contents.h b/impeller/entity/contents/linear_gradient_contents.h
@@ -49,8 +49,6 @@ class LinearGradientContents final : public ColorSourceContents {
 
   void SetTileMode(Entity::TileMode tile_mode);
 
-  void SetDither(bool dither);
-
  private:
   bool RenderTexture(const ContentContext& renderer,
                      const Entity& entity,
@@ -66,7 +64,6 @@ class LinearGradientContents final : public ColorSourceContents {
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
   Color decal_border_color_ = Color::BlackTransparent();
-  bool dither_ = false;
 
   FML_DISALLOW_COPY_AND_ASSIGN(LinearGradientContents);
 };

diff --git a/impeller/entity/contents/radial_gradient_contents.cc b/impeller/entity/contents/radial_gradient_contents.cc
@@ -29,10 +29,6 @@ void RadialGradientContents::SetTileMode(Entity::TileMode tile_mode) {
   tile_mode_ = tile_mode;
 }
 
-void RadialGradientContents::SetDither(bool dither) {
-  dither_ = dither;
-}
-
 void RadialGradientContents::SetColors(std::vector<Color> colors) {
   colors_ = std::move(colors);
 }
@@ -82,7 +78,6 @@ bool RadialGradientContents::RenderSSBO(const ContentContext& renderer,
   frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
   frag_info.decal_border_color = decal_border_color_;
   frag_info.alpha = GetOpacityFactor();
-  frag_info.dither = dither_;
 
   auto& host_buffer = pass.GetTransientsBuffer();
   auto colors = CreateGradientColors(colors_, stops_);

diff --git a/impeller/entity/contents/radial_gradient_contents.h b/impeller/entity/contents/radial_gradient_contents.h
@@ -48,8 +48,6 @@ class RadialGradientContents final : public ColorSourceContents {
 
   void SetTileMode(Entity::TileMode tile_mode);
 
-  void SetDither(bool dither);
-
  private:
   bool RenderTexture(const ContentContext& renderer,
                      const Entity& entity,
@@ -64,7 +62,6 @@ class RadialGradientContents final : public ColorSourceContents {
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
   Color decal_border_color_ = Color::BlackTransparent();
-  bool dither_ = false;
 
   FML_DISALLOW_COPY_AND_ASSIGN(RadialGradientContents);
 };

diff --git a/impeller/entity/contents/sweep_gradient_contents.cc b/impeller/entity/contents/sweep_gradient_contents.cc
@@ -42,10 +42,6 @@ void SweepGradientContents::SetTileMode(Entity::TileMode tile_mode) {
   tile_mode_ = tile_mode;
 }
 
-void SweepGradientContents::SetDither(bool dither) {
-  dither_ = dither;
-}
-
 const std::vector<Color>& SweepGradientContents::GetColors() const {
   return colors_;
 }
@@ -88,7 +84,6 @@ bool SweepGradientContents::RenderSSBO(const ContentContext& renderer,
   frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
   frag_info.decal_border_color = decal_border_color_;
   frag_info.alpha = GetOpacityFactor();
-  frag_info.dither = dither_;
 
   auto& host_buffer = pass.GetTransientsBuffer();
   auto colors = CreateGradientColors(colors_, stops_);

diff --git a/impeller/entity/contents/sweep_gradient_contents.h b/impeller/entity/contents/sweep_gradient_contents.h
@@ -45,8 +45,6 @@ class SweepGradientContents final : public ColorSourceContents {
 
   void SetTileMode(Entity::TileMode tile_mode);
 
-  void SetDither(bool dither);
-
   const std::vector<Color>& GetColors() const;
 
   const std::vector<Scalar>& GetStops() const;
@@ -67,7 +65,6 @@ class SweepGradientContents final : public ColorSourceContents {
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
   Color decal_border_color_ = Color::BlackTransparent();
-  bool dither_ = false;
 
   FML_DISALLOW_COPY_AND_ASSIGN(SweepGradientContents);
 };

diff --git a/impeller/entity/shaders/conical_gradient_ssbo_fill.frag b/impeller/entity/shaders/conical_gradient_ssbo_fill.frag
@@ -29,7 +29,6 @@ uniform FragInfo {
   int colors_length;
   vec2 focus;
   float focus_radius;
-  bool dither;
 }
 frag_info;
 
@@ -64,9 +63,7 @@ void main() {
       }
     }
   }
-  frag_color = IPPremultiply(result_color) * frag_info.alpha;
 
-  if (frag_info.dither) {
-    frag_color = IPOrderedDither8x8(frag_color, v_position);
-  }
+  frag_color = IPPremultiply(result_color) * frag_info.alpha;
+  frag_color = IPOrderedDither8x8(frag_color, v_position);
 }
diff --git a/impeller/entity/shaders/linear_gradient_ssbo_fill.frag b/impeller/entity/shaders/linear_gradient_ssbo_fill.frag
@@ -26,7 +26,6 @@ uniform FragInfo {
   float tile_mode;
   vec4 decal_border_color;
   int colors_length;
-  bool dither;
 }
 frag_info;
 
@@ -60,9 +59,7 @@ void main() {
       }
     }
   }
-  frag_color = IPPremultiply(frag_color) * frag_info.alpha;
 
-  if (frag_info.dither) {
-    frag_color = IPOrderedDither8x8(frag_color, v_position);
-  }
+  frag_color = IPPremultiply(frag_color) * frag_info.alpha;
+  frag_color = IPOrderedDither8x8(frag_color, v_position);
 }
diff --git a/impeller/entity/shaders/radial_gradient_ssbo_fill.frag b/impeller/entity/shaders/radial_gradient_ssbo_fill.frag
@@ -27,7 +27,6 @@ uniform FragInfo {
   vec4 decal_border_color;
   float alpha;
   int colors_length;
-  bool dither;
 }
 frag_info;
 
@@ -60,9 +59,7 @@ void main() {
       }
     }
   }
-  frag_color = IPPremultiply(result_color) * frag_info.alpha;
 
-  if (frag_info.dither) {
-    frag_color = IPOrderedDither8x8(frag_color, v_position);
-  }
+  frag_color = IPPremultiply(result_color) * frag_info.alpha;
+  frag_color = IPOrderedDither8x8(frag_color, v_position);
 }
diff --git a/impeller/entity/shaders/sweep_gradient_ssbo_fill.frag b/impeller/entity/shaders/sweep_gradient_ssbo_fill.frag
@@ -27,7 +27,6 @@ uniform FragInfo {
   vec4 decal_border_color;
   float alpha;
   int colors_length;
-  bool dither;
 }
 frag_info;
 
@@ -61,9 +60,7 @@ void main() {
       }
     }
   }
-  frag_color = IPPremultiply(result_color) * frag_info.alpha;
 
-  if (frag_info.dither) {
-    frag_color = IPOrderedDither8x8(frag_color, v_position);
-  }
+  frag_color = IPPremultiply(result_color) * frag_info.alpha;
+  frag_color = IPOrderedDither8x8(frag_color, v_position);
 }