some texture coordinates work

Author: jonahwilliams

impeller/aiks/canvas.cc

@@ -398,9 +398,11 @@ void Canvas::DrawVertices(std::unique_ptr<VerticesGeometry> vertices,
     return;
   }
   auto contents = std::make_shared<VerticesContents>();
-  contents->SetSrcContents(paint.CreateContentsForGeometry(
+  auto opaque_paint = paint;
+  opaque_paint.color = opaque_paint.color.WithAlpha(1.0);
+  contents->SetSrcContents(opaque_paint.CreateContentsForGeometry(
       Geometry::MakeRect(Rect::MakeSize(rect.value().size))));
-  contents->SetColor(paint.color);
+  contents->SetAlpha(paint.color.alpha);
   contents->SetBlendMode(blend_mode);
   contents->SetGeometry(std::move(vertices));
   entity.SetContents(paint.WithFilters(contents));

impeller/display_list/display_list_unittests.cc

@@ -1111,6 +1111,38 @@ TEST_P(DisplayListTest, DrawVerticesLinearGradientWithoutIndices) {
   ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
 }
 
+TEST_P(DisplayListTest, DrawVerticesLinearGradientWithTextureCoordinates) {
+  std::vector<SkPoint> positions = {SkPoint::Make(100, 300),
+                                    SkPoint::Make(200, 100),
+                                    SkPoint::Make(300, 300)};
+  std::vector<SkPoint> texture_coordinates = {SkPoint::Make(1.0, 1.0),
+                                              SkPoint::Make(0.0, 1.0),
+                                              SkPoint::Make(0.0, 0.0)};
+  std::vector<flutter::DlColor> colors = {flutter::DlColor::kRed(),
+                                          flutter::DlColor::kGreen(),
+                                          flutter::DlColor::kBlue()};
+
+  auto vertices = flutter::DlVertices::Make(
+      flutter::DlVertexMode::kTriangles, 3, positions.data(),
+      texture_coordinates.data(), colors.data());
+
+  std::vector<flutter::DlColor> gradient_colors = {flutter::DlColor::kBlue(),
+                                                  flutter::DlColor::kRed()};
+  const float stops[2] = {0.0, 1.0};
+
+  auto linear = flutter::DlColorSource::MakeLinear(
+      {100.0, 100.0}, {300.0, 300.0}, 2, gradient_colors.data(), stops,
+      flutter::DlTileMode::kRepeat);
+
+  flutter::DisplayListBuilder builder;
+  flutter::DlPaint paint;
+
+  paint.setColorSource(linear);
+  builder.drawVertices(vertices, flutter::DlBlendMode::kSrcOver, paint);
+
+  ASSERT_TRUE(OpenPlaygroundHere(builder.Build()));
+}
+
 TEST_P(DisplayListTest, DrawVerticesSolidColorTrianglesWithIndices) {
   std::vector<SkPoint> positions = {
       SkPoint::Make(100, 300), SkPoint::Make(200, 100), SkPoint::Make(300, 300),

impeller/display_list/display_list_vertices_geometry.cc

@@ -21,6 +21,10 @@ static Rect ToRect(const SkRect& rect) {
   return Rect::MakeLTRB(rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
 }
 
+static Point ToPoint(const SkPoint& point) {
+  return Point::MakeXY(point.fX, point.fY);
+}
+
 // Fan mode isn't natively supported. Unroll into triangle mode by
 // manipulating the index array.
 //
@@ -234,16 +238,21 @@ GeometryResult DLVerticesGeometry::GetPositionUVBuffer(
                          : normalized_indices_.data();
   auto* dl_vertices = vertices_->vertices();
   auto* dl_colors = vertices_->colors();
+  auto* dl_tex_coords = vertices_->texture_coordinates();
 
   auto coverage_rect = ToRect(vertices_->bounds());
   std::vector<VS::PerVertexData> vertex_data(vertex_count);
+
   for (auto i = 0; i < vertex_count; i++) {
     auto dl_color = dl_colors[i];
     auto color = Color(dl_color.getRedF(), dl_color.getGreenF(),
                        dl_color.getBlueF(), dl_color.getAlphaF());
     auto sk_point = dl_vertices[i];
     auto vertex = Point(sk_point.x(), sk_point.y());
-    auto coverage_coords = (vertex - coverage_rect.origin) / coverage_rect.size;
+    auto coverage_coords =
+        (dl_tex_coords == nullptr)
+            ? (vertex - coverage_rect.origin) / coverage_rect.size
+            : ToPoint(dl_tex_coords[i]);
 
     vertex_data[i] = {
         .vertices = vertex,

impeller/entity/contents/vertices_contents.cc

@@ -29,8 +29,8 @@ void VerticesContents::SetGeometry(std::unique_ptr<VerticesGeometry> geometry) {
   geometry_ = std::move(geometry);
 }
 
-void VerticesContents::SetColor(Color color) {
-  color_ = color;
+void VerticesContents::SetAlpha(Scalar alpha) {
+  alpha_ = alpha;
 }
 
 void VerticesContents::SetBlendMode(BlendMode blend_mode) {
@@ -184,7 +184,7 @@ bool VerticesContents::Render(const ContentContext& renderer,
 
   FS::FragInfo frag_info;
   frag_info.src_y_coord_scale = src_texture->texture->GetYCoordScale();
-  frag_info.alpha = color_.alpha;
+  frag_info.alpha = alpha_;
 
   cmd.stencil_reference = entity.GetStencilDepth();
   cmd.BindVertices(geometry_result.vertex_buffer);
@@ -222,7 +222,7 @@ bool VerticesContents::RenderDestination(const ContentContext& renderer,
   VS::BindVertInfo(cmd, host_buffer.EmplaceUniform(vert_info));
 
   FS::FragInfo frag_info;
-  frag_info.alpha = color_.alpha;
+  frag_info.alpha = alpha_;
   FS::BindFragInfo(cmd, host_buffer.EmplaceUniform(frag_info));
 
   return pass.AddCommand(std::move(cmd));

impeller/entity/contents/vertices_contents.h

@@ -27,7 +27,7 @@ class VerticesContents final : public Contents {
 
   void SetGeometry(std::unique_ptr<VerticesGeometry> geometry);
 
-  void SetColor(Color color);
+  void SetAlpha(Scalar alpha);
 
   void SetBlendMode(BlendMode blend_mode);
 
@@ -46,7 +46,7 @@ class VerticesContents final : public Contents {
                          const Entity& entity,
                          RenderPass& pass) const;
 
-  Color color_;
+  Scalar alpha_;
   std::shared_ptr<Contents> src_contents_;
   std::unique_ptr<VerticesGeometry> geometry_;
   BlendMode blend_mode_ = BlendMode::kSource;