Apply color filter to gradient decal borders

bdero · bdero · commit cae105f1393e · 2023-07-10T17:23:35.000-07:00
diff --git a/impeller/compiler/shader_lib/impeller/texture.glsl b/impeller/compiler/shader_lib/impeller/texture.glsl
@@ -114,10 +114,11 @@ vec4 IPSampleLinearWithTileMode(sampler2D tex,
                                 float y_coord_scale,
                                 vec2 half_texel,
                                 float x_tile_mode,
-                                float y_tile_mode) {
+                                float y_tile_mode,
+                                vec4 decal_border_color) {
   if (x_tile_mode == kTileModeDecal && (coords.x < 0 || coords.x >= 1) ||
       y_tile_mode == kTileModeDecal && (coords.y < 0 || coords.y >= 1)) {
-    return vec4(0);
+    return decal_border_color;
   }
 
   return IPSampleLinear(tex, IPVec2Tile(coords, x_tile_mode, y_tile_mode),
@@ -152,9 +153,10 @@ vec4 IPSampleLinearWithTileMode(sampler2D tex,
                                 vec2 coords,
                                 float y_coord_scale,
                                 vec2 half_texel,
-                                float tile_mode) {
+                                float tile_mode,
+                                vec4 decal_border_color) {
   return IPSampleLinearWithTileMode(tex, coords, y_coord_scale, half_texel,
-                                    tile_mode, tile_mode);
+                                    tile_mode, tile_mode, decal_border_color);
 }
 
 #endif
diff --git a/impeller/entity/contents/conical_gradient_contents.cc b/impeller/entity/contents/conical_gradient_contents.cc
@@ -140,6 +140,7 @@ bool ConicalGradientContents::RenderTexture(const ContentContext& renderer,
   frag_info.center = center_;
   frag_info.radius = radius_;
   frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+  frag_info.decal_border_color = decal_border_color_.Premultiply();
   frag_info.texture_sampler_y_coord_scale = gradient_texture->GetYCoordScale();
   frag_info.alpha = GetOpacity();
   frag_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,
@@ -198,6 +199,7 @@ bool ConicalGradientContents::ApplyColorFilter(
   for (Color& color : colors_) {
     color = color_filter_proc(color);
   }
+  decal_border_color_ = color_filter_proc(decal_border_color_);
   return true;
 }
 
diff --git a/impeller/entity/contents/conical_gradient_contents.h b/impeller/entity/contents/conical_gradient_contents.h
@@ -60,6 +60,7 @@ class ConicalGradientContents final : public ColorSourceContents {
   std::vector<Color> colors_;
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
+  Color decal_border_color_ = Color::BlackTransparent();
   std::optional<Point> focus_;
   Scalar focus_radius_ = 0.0f;
 
diff --git a/impeller/entity/contents/linear_gradient_contents.cc b/impeller/entity/contents/linear_gradient_contents.cc
@@ -82,6 +82,7 @@ bool LinearGradientContents::RenderTexture(const ContentContext& renderer,
   frag_info.start_point = start_point_;
   frag_info.end_point = end_point_;
   frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+  frag_info.decal_border_color = decal_border_color_.Premultiply();
   frag_info.texture_sampler_y_coord_scale = gradient_texture->GetYCoordScale();
   frag_info.alpha = GetOpacity();
   frag_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,
@@ -189,6 +190,7 @@ bool LinearGradientContents::ApplyColorFilter(
   for (Color& color : colors_) {
     color = color_filter_proc(color);
   }
+  decal_border_color_ = color_filter_proc(decal_border_color_);
   return true;
 }
 
diff --git a/impeller/entity/contents/linear_gradient_contents.h b/impeller/entity/contents/linear_gradient_contents.h
@@ -63,6 +63,7 @@ class LinearGradientContents final : public ColorSourceContents {
   std::vector<Color> colors_;
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
+  Color decal_border_color_ = Color::BlackTransparent();
 
   FML_DISALLOW_COPY_AND_ASSIGN(LinearGradientContents);
 };
diff --git a/impeller/entity/contents/radial_gradient_contents.cc b/impeller/entity/contents/radial_gradient_contents.cc
@@ -139,6 +139,7 @@ bool RadialGradientContents::RenderTexture(const ContentContext& renderer,
   frag_info.center = center_;
   frag_info.radius = radius_;
   frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+  frag_info.decal_border_color = decal_border_color_.Premultiply();
   frag_info.texture_sampler_y_coord_scale = gradient_texture->GetYCoordScale();
   frag_info.alpha = GetOpacity();
   frag_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,
@@ -190,6 +191,7 @@ bool RadialGradientContents::ApplyColorFilter(
   for (Color& color : colors_) {
     color = color_filter_proc(color);
   }
+  decal_border_color_ = color_filter_proc(decal_border_color_);
   return true;
 }
 
diff --git a/impeller/entity/contents/radial_gradient_contents.h b/impeller/entity/contents/radial_gradient_contents.h
@@ -61,6 +61,7 @@ class RadialGradientContents final : public ColorSourceContents {
   std::vector<Color> colors_;
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
+  Color decal_border_color_ = Color::BlackTransparent();
 
   FML_DISALLOW_COPY_AND_ASSIGN(RadialGradientContents);
 };
diff --git a/impeller/entity/contents/sweep_gradient_contents.cc b/impeller/entity/contents/sweep_gradient_contents.cc
@@ -147,6 +147,7 @@ bool SweepGradientContents::RenderTexture(const ContentContext& renderer,
   frag_info.scale = scale_;
   frag_info.texture_sampler_y_coord_scale = gradient_texture->GetYCoordScale();
   frag_info.tile_mode = static_cast<Scalar>(tile_mode_);
+  frag_info.decal_border_color = decal_border_color_.Premultiply();
   frag_info.alpha = GetOpacity();
   frag_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,
                                  0.5 / gradient_texture->GetSize().height);
@@ -197,6 +198,7 @@ bool SweepGradientContents::ApplyColorFilter(
   for (Color& color : colors_) {
     color = color_filter_proc(color);
   }
+  decal_border_color_ = color_filter_proc(decal_border_color_);
   return true;
 }
 
diff --git a/impeller/entity/contents/sweep_gradient_contents.h b/impeller/entity/contents/sweep_gradient_contents.h
@@ -64,6 +64,7 @@ class SweepGradientContents final : public ColorSourceContents {
   std::vector<Color> colors_;
   std::vector<Scalar> stops_;
   Entity::TileMode tile_mode_;
+  Color decal_border_color_ = Color::BlackTransparent();
 
   FML_DISALLOW_COPY_AND_ASSIGN(SweepGradientContents);
 };
diff --git a/impeller/entity/shaders/conical_gradient_fill.frag b/impeller/entity/shaders/conical_gradient_fill.frag
@@ -14,6 +14,7 @@ uniform FragInfo {
   highp vec2 center;
   float radius;
   float tile_mode;
+  vec4 decal_border_color;
   float texture_sampler_y_coord_scale;
   float alpha;
   vec2 half_texel;
@@ -35,9 +36,13 @@ void main() {
   }
 
   float t = res.x;
-  frag_color = IPSampleLinearWithTileMode(
-      texture_sampler, vec2(t, 0.5), frag_info.texture_sampler_y_coord_scale,
-      frag_info.half_texel, frag_info.tile_mode);
+  frag_color =
+      IPSampleLinearWithTileMode(texture_sampler,                          //
+                                 vec2(t, 0.5),                             //
+                                 frag_info.texture_sampler_y_coord_scale,  //
+                                 frag_info.half_texel,                     //
+                                 frag_info.tile_mode,                      //
+                                 frag_info.decal_border_color);
   frag_color =
       vec4(frag_color.xyz * frag_color.a, frag_color.a) * frag_info.alpha;
 }
diff --git a/impeller/entity/shaders/linear_gradient_fill.frag b/impeller/entity/shaders/linear_gradient_fill.frag
@@ -13,6 +13,7 @@ uniform FragInfo {
   highp vec2 start_point;
   highp vec2 end_point;
   float tile_mode;
+  vec4 decal_border_color;
   float texture_sampler_y_coord_scale;
   float alpha;
   vec2 half_texel;
@@ -28,9 +29,13 @@ void main() {
   vec2 start_to_position = v_position - frag_info.start_point;
   float t =
       dot(start_to_position, start_to_end) / dot(start_to_end, start_to_end);
-  frag_color = IPSampleLinearWithTileMode(
-      texture_sampler, vec2(t, 0.5), frag_info.texture_sampler_y_coord_scale,
-      frag_info.half_texel, frag_info.tile_mode);
+  frag_color =
+      IPSampleLinearWithTileMode(texture_sampler,                          //
+                                 vec2(t, 0.5),                             //
+                                 frag_info.texture_sampler_y_coord_scale,  //
+                                 frag_info.half_texel,                     //
+                                 frag_info.tile_mode,                      //
+                                 frag_info.decal_border_color);
   frag_color =
       vec4(frag_color.xyz * frag_color.a, frag_color.a) * frag_info.alpha;
 }
diff --git a/impeller/entity/shaders/radial_gradient_fill.frag b/impeller/entity/shaders/radial_gradient_fill.frag
@@ -13,6 +13,7 @@ uniform FragInfo {
   highp vec2 center;
   float radius;
   float tile_mode;
+  vec4 decal_border_color;
   float texture_sampler_y_coord_scale;
   float alpha;
   vec2 half_texel;
@@ -26,9 +27,13 @@ out vec4 frag_color;
 void main() {
   float len = length(v_position - frag_info.center);
   float t = len / frag_info.radius;
-  frag_color = IPSampleLinearWithTileMode(
-      texture_sampler, vec2(t, 0.5), frag_info.texture_sampler_y_coord_scale,
-      frag_info.half_texel, frag_info.tile_mode);
+  frag_color =
+      IPSampleLinearWithTileMode(texture_sampler,                          //
+                                 vec2(t, 0.5),                             //
+                                 frag_info.texture_sampler_y_coord_scale,  //
+                                 frag_info.half_texel,                     //
+                                 frag_info.tile_mode,                      //
+                                 frag_info.decal_border_color);
   frag_color =
       vec4(frag_color.xyz * frag_color.a, frag_color.a) * frag_info.alpha;
 }
diff --git a/impeller/entity/shaders/sweep_gradient_fill.frag b/impeller/entity/shaders/sweep_gradient_fill.frag
@@ -15,6 +15,7 @@ uniform FragInfo {
   float bias;
   float scale;
   float tile_mode;
+  vec4 decal_border_color;
   float texture_sampler_y_coord_scale;
   float alpha;
   vec2 half_texel;
@@ -30,9 +31,13 @@ void main() {
   float angle = atan(-coord.y, -coord.x);
 
   float t = (angle * k1Over2Pi + 0.5 + frag_info.bias) * frag_info.scale;
-  frag_color = IPSampleLinearWithTileMode(
-      texture_sampler, vec2(t, 0.5), frag_info.texture_sampler_y_coord_scale,
-      frag_info.half_texel, frag_info.tile_mode);
+  frag_color =
+      IPSampleLinearWithTileMode(texture_sampler,                          //
+                                 vec2(t, 0.5),                             //
+                                 frag_info.texture_sampler_y_coord_scale,  //
+                                 frag_info.half_texel,                     //
+                                 frag_info.tile_mode,                      //
+                                 frag_info.decal_border_color);
   frag_color =
       vec4(frag_color.xyz * frag_color.a, frag_color.a) * frag_info.alpha;
 }

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ bool ConicalGradientContents::RenderTexture(const ContentContext& renderer,`
`140`	`140`	`frag_info.center = center_;`
`141`	`141`	`frag_info.radius = radius_;`
`142`	`142`	`frag_info.tile_mode = static_cast<Scalar>(tile_mode_);`
	`143`	`+ frag_info.decal_border_color = decal_border_color_.Premultiply();`
`143`	`144`	`frag_info.texture_sampler_y_coord_scale = gradient_texture->GetYCoordScale();`
`144`	`145`	`frag_info.alpha = GetOpacity();`
`145`	`146`	`frag_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,`
`@@ -198,6 +199,7 @@ bool ConicalGradientContents::ApplyColorFilter(`
`198`	`199`	`for (Color& color : colors_) {`
`199`	`200`	`color = color_filter_proc(color);`
`200`	`201`	`}`
	`202`	`+ decal_border_color_ = color_filter_proc(decal_border_color_);`
`201`	`203`	`return true;`
`202`	`204`	`}`
`203`	`205`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ bool LinearGradientContents::RenderTexture(const ContentContext& renderer,`
`82`	`82`	`frag_info.start_point = start_point_;`
`83`	`83`	`frag_info.end_point = end_point_;`
`84`	`84`	`frag_info.tile_mode = static_cast<Scalar>(tile_mode_);`
	`85`	`+ frag_info.decal_border_color = decal_border_color_.Premultiply();`
`85`	`86`	`frag_info.texture_sampler_y_coord_scale = gradient_texture->GetYCoordScale();`
`86`	`87`	`frag_info.alpha = GetOpacity();`
`87`	`88`	`frag_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,`
`@@ -189,6 +190,7 @@ bool LinearGradientContents::ApplyColorFilter(`
`189`	`190`	`for (Color& color : colors_) {`
`190`	`191`	`color = color_filter_proc(color);`
`191`	`192`	`}`
	`193`	`+ decal_border_color_ = color_filter_proc(decal_border_color_);`
`192`	`194`	`return true;`
`193`	`195`	`}`
`194`	`196`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,7 @@ bool RadialGradientContents::RenderTexture(const ContentContext& renderer,`
`139`	`139`	`frag_info.center = center_;`
`140`	`140`	`frag_info.radius = radius_;`
`141`	`141`	`frag_info.tile_mode = static_cast<Scalar>(tile_mode_);`
	`142`	`+ frag_info.decal_border_color = decal_border_color_.Premultiply();`
`142`	`143`	`frag_info.texture_sampler_y_coord_scale = gradient_texture->GetYCoordScale();`
`143`	`144`	`frag_info.alpha = GetOpacity();`
`144`	`145`	`frag_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,`
`@@ -190,6 +191,7 @@ bool RadialGradientContents::ApplyColorFilter(`
`190`	`191`	`for (Color& color : colors_) {`
`191`	`192`	`color = color_filter_proc(color);`
`192`	`193`	`}`
	`194`	`+ decal_border_color_ = color_filter_proc(decal_border_color_);`
`193`	`195`	`return true;`
`194`	`196`	`}`
`195`	`197`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ bool SweepGradientContents::RenderTexture(const ContentContext& renderer,`
`147`	`147`	`frag_info.scale = scale_;`
`148`	`148`	`frag_info.texture_sampler_y_coord_scale = gradient_texture->GetYCoordScale();`
`149`	`149`	`frag_info.tile_mode = static_cast<Scalar>(tile_mode_);`
	`150`	`+ frag_info.decal_border_color = decal_border_color_.Premultiply();`
`150`	`151`	`frag_info.alpha = GetOpacity();`
`151`	`152`	`frag_info.half_texel = Vector2(0.5 / gradient_texture->GetSize().width,`
`152`	`153`	`0.5 / gradient_texture->GetSize().height);`
`@@ -197,6 +198,7 @@ bool SweepGradientContents::ApplyColorFilter(`
`197`	`198`	`for (Color& color : colors_) {`
`198`	`199`	`color = color_filter_proc(color);`
`199`	`200`	`}`
	`201`	`+ decal_border_color_ = color_filter_proc(decal_border_color_);`
`200`	`202`	`return true;`
`201`	`203`	`}`
`202`	`204`