Expose C API for tessellator, move to own subdir (#18)

dnfield · dnfield · commit 9d6048ab0842 · 2022-04-27T15:57:33.000-07:00
diff --git a/impeller/BUILD.gn b/impeller/BUILD.gn
@@ -21,6 +21,7 @@ group("impeller") {
     "geometry",
     "image",
     "renderer",
+    "tessellator",
     "typographer",
   ]
 
diff --git a/impeller/entity/contents/linear_gradient_contents.cc b/impeller/entity/contents/linear_gradient_contents.cc
@@ -7,7 +7,7 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/entity.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/tessellator.h"
+#include "impeller/tessellator/tessellator.h"
 
 namespace impeller {
 
diff --git a/impeller/entity/contents/solid_color_contents.cc b/impeller/entity/contents/solid_color_contents.cc
@@ -8,7 +8,7 @@
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/path.h"
 #include "impeller/renderer/render_pass.h"
-#include "impeller/renderer/tessellator.h"
+#include "impeller/tessellator/tessellator.h"
 
 namespace impeller {
 
diff --git a/impeller/entity/contents/text_contents.cc b/impeller/entity/contents/text_contents.cc
@@ -9,7 +9,7 @@
 #include "impeller/geometry/path_builder.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/sampler_library.h"
-#include "impeller/renderer/tessellator.h"
+#include "impeller/tessellator/tessellator.h"
 #include "impeller/typographer/glyph_atlas.h"
 
 namespace impeller {
diff --git a/impeller/entity/contents/texture_contents.cc b/impeller/entity/contents/texture_contents.cc
@@ -10,7 +10,7 @@
 #include "impeller/entity/texture_fill.vert.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/sampler_library.h"
-#include "impeller/renderer/tessellator.h"
+#include "impeller/tessellator/tessellator.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/BUILD.gn b/impeller/renderer/BUILD.gn
@@ -91,8 +91,6 @@ impeller_component("renderer") {
               "shader_types.h",
               "surface.h",
               "surface.cc",
-              "tessellator.cc",
-              "tessellator.h",
               "texture.h",
               "texture.cc",
               "texture_descriptor.h",
@@ -109,10 +107,9 @@ impeller_component("renderer") {
     "../base",
     "../geometry",
     "../image",
+    "../tessellator",
   ]
 
-  deps = [ "//third_party/libtess2" ]
-
   frameworks = [ "Metal.framework" ]
 }
 
diff --git a/impeller/renderer/command.h b/impeller/renderer/command.h
@@ -20,6 +20,7 @@
 #include "impeller/renderer/texture.h"
 #include "impeller/renderer/vertex_buffer.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
+#include "impeller/tessellator/tessellator.h"
 
 namespace impeller {
 
diff --git a/impeller/renderer/formats.h b/impeller/renderer/formats.h
@@ -131,11 +131,6 @@ enum class TextureUsage : TextureUsageMask {
   kRenderTarget = 1 << 2,
 };
 
-enum class WindingOrder {
-  kClockwise,
-  kCounterClockwise,
-};
-
 enum class CullMode {
   kNone,
   kFrontFace,
diff --git a/impeller/renderer/renderer_unittests.cc b/impeller/renderer/renderer_unittests.cc
@@ -21,7 +21,7 @@
 #include "impeller/renderer/sampler_descriptor.h"
 #include "impeller/renderer/sampler_library.h"
 #include "impeller/renderer/surface.h"
-#include "impeller/renderer/tessellator.h"
+#include "impeller/tessellator/tessellator.h"
 #include "impeller/renderer/vertex_buffer_builder.h"
 
 namespace impeller {
diff --git a/impeller/renderer/tessellator.cc b/impeller/renderer/tessellator.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "impeller/renderer/tessellator.h"
+#include "impeller/tessellator/tessellator.h"
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/trace_event.h"
diff --git a/impeller/tessellator/BUILD.gn b/impeller/tessellator/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//flutter/impeller/tools/impeller.gni")
+
+impeller_component("tessellator") {
+  sources = [
+    "tessellator.cc",
+    "tessellator.h",
+  ]
+
+  public_deps = [ "../geometry" ]
+
+  deps = [ "//third_party/libtess2" ]
+}
+
+shared_library("tessellator_shared") {
+  output_name = "tessellator"
+
+  sources = [
+    "c/tessellator.h",
+    "c/tessellator.cc",
+    "tessellator.cc",
+    "tessellator.h",
+  ]
+
+  deps = [
+    "../geometry",
+    "//flutter/fml",
+    "//third_party/libtess2",
+  ]
+}
diff --git a/impeller/tessellator/c/tessellator.cc b/impeller/tessellator/c/tessellator.cc
@@ -0,0 +1,68 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "tessellator.h"
+
+#include <vector>
+
+namespace impeller {
+PathBuilder* CreatePathBuilder() {
+  return new PathBuilder();
+}
+
+void DestroyPathBuilder(PathBuilder* builder) {
+  delete builder;
+}
+
+void MoveTo(PathBuilder* builder, Scalar x, Scalar y) {
+  builder->MoveTo(Point(x, y));
+}
+
+void LineTo(PathBuilder* builder, Scalar x, Scalar y) {
+  builder->LineTo(Point(x, y));
+}
+
+void CubicTo(PathBuilder* builder,
+             Scalar x1,
+             Scalar y1,
+             Scalar x2,
+             Scalar y2,
+             Scalar x3,
+             Scalar y3) {
+  builder->CubicCurveTo(Point(x1, y1), Point(x2, y2), Point(x3, y3));
+}
+
+void Close(PathBuilder* builder) {
+  builder->Close();
+}
+
+struct Vertices* Tessellate(PathBuilder* builder) {
+  auto path = builder->CopyPath();
+  auto polyline = path.CreatePolyline();
+
+  std::vector<float> points;
+  if (!Tessellator{path.GetFillType()}.Tessellate(polyline,
+                                                  [&points](Point vertex) {
+                                                    points.push_back(vertex.x);
+                                                    points.push_back(vertex.y);
+                                                  })) {
+    return nullptr;
+  }
+
+  Vertices* vertices = new Vertices();
+  vertices->points = new float[points.size()];
+  if (!vertices->points) {
+    return nullptr;
+  }
+  vertices->length = points.size();
+  std::copy(points.begin(), points.end(), vertices->points);
+  return vertices;
+}
+
+void DestroyVertices(Vertices* vertices) {
+  delete vertices->points;
+  delete vertices;
+}
+
+}  // namespace impeller
diff --git a/impeller/tessellator/c/tessellator.h b/impeller/tessellator/c/tessellator.h
@@ -0,0 +1,44 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#pragma once
+
+#include "impeller/geometry/path_builder.h"
+#include "impeller/tessellator/tessellator.h"
+
+#define IMPELLER_API __attribute__((visibility("default")))
+
+extern "C" {
+
+namespace impeller {
+
+struct IMPELLER_API Vertices {
+  float* points;
+  uint32_t length;
+};
+
+IMPELLER_API PathBuilder* CreatePathBuilder();
+
+IMPELLER_API void DestroyPathBuilder(PathBuilder* builder);
+
+IMPELLER_API void MoveTo(PathBuilder* builder, Scalar x, Scalar y);
+
+IMPELLER_API void LineTo(PathBuilder* builder, Scalar x, Scalar y);
+
+IMPELLER_API void CubicTo(PathBuilder* builder,
+                          Scalar x1,
+                          Scalar y1,
+                          Scalar x2,
+                          Scalar y2,
+                          Scalar x3,
+                          Scalar y3);
+
+IMPELLER_API void Close(PathBuilder* builder);
+
+IMPELLER_API struct Vertices* Tessellate(PathBuilder* builder);
+
+IMPELLER_API void DestroyVertices(Vertices* vertices);
+
+}  // namespace impeller
+}
diff --git a/impeller/tessellator/dart/lib/tessellator.dart b/impeller/tessellator/dart/lib/tessellator.dart
diff --git a/impeller/tessellator/dart/pubspec.yaml b/impeller/tessellator/dart/pubspec.yaml
diff --git a/impeller/tessellator/tessellator.cc b/impeller/tessellator/tessellator.cc
diff --git a/impeller/tessellator/tessellator.h b/impeller/tessellator/tessellator.h

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ group("impeller") {`
`21`	`21`	`"geometry",`
`22`	`22`	`"image",`
`23`	`23`	`"renderer",`
	`24`	`+ "tessellator",`
`24`	`25`	`"typographer",`
`25`	`26`	`]`
`26`	`27`