merge with master

.gitignore

@@ -8,6 +8,7 @@ node_modules
 /examples/c_canvas_minimal/build
 /shaders/build
 /c/build
+/examples/macos_app/Pathfinder\ Example.xcodeproj/project.xcworkspace/xcuserdata/*
 
 # Editors
 *.swp

Cargo.toml

@@ -13,7 +13,6 @@ members = [
     "examples/canvas_moire",
     "examples/canvas_text",
     "examples/lottie_basic",
-    "examples/convert",
     "examples/swf_basic",
     "geometry",
     "gl",
@@ -29,5 +28,6 @@ members = [
     "ui",
     "utils/area-lut",
     "utils/gamma-lut",
-    "utils/svg-to-skia"
+    "utils/svg-to-skia",
+    "utils/convert",
 ]

README.md

@@ -3,7 +3,7 @@
 # Pathfinder 3
 
 Pathfinder 3 is a fast, practical, GPU-based rasterizer for fonts and vector graphics using OpenGL
-and OpenGL ES 3.0+.
+3.0+, OpenGL ES 3.0+, or Metal.
 
 Please note that Pathfinder is under heavy development and is incomplete in various areas.
 
@@ -75,12 +75,6 @@ The SDL 2 library requires some additional manual installation steps. Follow the
 [`rust-sdl2` installation instructions](https://github.com/Rust-SDL2/rust-sdl2#sdl20-development-libraries) to make sure the libraries are installed. Note that SDL2 is
 only required to run the demo; Pathfinder itself has no dependency on the library.
 
-On macOS, it is recommended that you force the use of the integrated GPU, as issues with Apple's
-OpenGL drivers may limit performance on discrete GPUs. You can use
-[gfxCardStatus.app](https://gfx.io/) for this. See the
-[wiki](https://github.com/pcwalton/pathfinder/wiki/GPU-driver-compatibility) for more information
-on GPU compatibility issues.
-
 ## Authors
 
 The primary author is Patrick Walton (@pcwalton), with contributions from the Servo development

c/cbindgen.toml

@@ -2,18 +2,53 @@ language = "C"
 header = """\
 /* Generated code. Do not edit; instead run `cargo build` in `pathfinder_c`. */
 
+#ifndef PF_PATHFINDER_H
+#define PF_PATHFINDER_H
+
+#ifdef __APPLE__
+#include <QuartzCore/QuartzCore.h>
+#endif
+
+#ifdef __cplusplus
 extern \"C\" {
+#endif
+"""
+trailer = """\
+#ifdef __cplusplus
+}
+#endif
+
+#endif
 """
-trailer = "}"
-include_guard = "PF_PATHFINDER_H"
 include_version = true
 
 [parse]
 parse_deps = true
 include = [
+    "font-kit",
     "pathfinder_canvas",
     "pathfinder_content",
     "pathfinder_geometry",
     "pathfinder_gl",
+    "pathfinder_gpu",
+    "pathfinder_metal",
     "pathfinder_renderer",
 ]
+
+[export.rename]
+"BuildOptions" = "PFBuildOptionsPrivate"
+"CanvasFontContext" = "PFCanvasFontContextPrivate"
+"CanvasRenderingContext2D" = "PFCanvasRenderingContext2DPrivate"
+"DestFramebuffer_GLDevice" = "PFDestFramebufferGLDevicePrivate"
+"DestFramebuffer_MetalDevice" = "PFDestFramebufferMetalDevicePrivate"
+"FillStyle" = "PFFillStylePrivate"
+"GLDevice" = "PFGLDevicePrivate"
+"Handle" = "FKHandlePrivate"
+"MetalDevice" = "PFMetalDevicePrivate"
+"Path2D" = "PFPath2DPrivate"
+"RenderTransform" = "PFRenderTransformPrivate"
+"Renderer_GLDevice" = "PFRendererGLDevicePrivate"
+"Renderer_MetalDevice" = "PFRendererMetalDevicePrivate"
+"ResourceLoaderWrapper" = "PFResourceLoaderWrapperPrivate"
+"Scene" = "PFScenePrivate"
+"SceneProxy" = "PFSceneProxyPrivate"