diff --git a/.vscode/settings.json b/.vscode/settings.json index 6be52f083..52fff87d4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,7 +16,6 @@ }, "wgsl-analyzer.diagnostics.nagaVersion": "main", "wgsl-analyzer.preprocessor.shaderDefs": [ - "full", "msaa16", "msaa" ], diff --git a/CHANGELOG.md b/CHANGELOG.md index 1958a3a7b..f33b8fab0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ This is the first step towards providing richer color functionality, better hand - Breaking: Updated `wgpu` to 23.0.1 ([#735][], [#743][] by [@waywardmonkeys]) - Breaking: Updated to new `peniko` and `color` is now used for all colors ([#742][] by [@waywardmonkeys]) +- Breaking: The `full` feature is no longer present as the full pipeline is now always built ([#754][] by [@waywardmonkeys]) ### Fixed @@ -210,6 +211,7 @@ This release has an [MSRV][] of 1.75. [#740]: https://github.com/linebender/vello/pull/740 [#742]: https://github.com/linebender/vello/pull/742 [#743]: https://github.com/linebender/vello/pull/743 +[#754]: https://github.com/linebender/vello/pull/754 [Unreleased]: https://github.com/linebender/vello/compare/v0.3.0...HEAD diff --git a/vello_encoding/Cargo.toml b/vello_encoding/Cargo.toml index e22f4706c..cc684ffed 100644 --- a/vello_encoding/Cargo.toml +++ b/vello_encoding/Cargo.toml @@ -16,12 +16,6 @@ default-target = "x86_64-unknown-linux-gnu" targets = [] [features] -default = ["full"] - -# Enables support for the full pipeline including late-bound -# resources (gradients, images and glyph runs) -full = ["dep:skrifa", "dep:guillotiere", "dep:smallvec"] - # Enables an optional GPU memory usage estimation utility. This can be used to # perform additional computations in order to estimate the minimum required allocations # for buffers backing bump-allocated GPU memory. @@ -32,7 +26,7 @@ workspace = true [dependencies] bytemuck = { workspace = true } -skrifa = { workspace = true, optional = true } +skrifa = { workspace = true } peniko = { workspace = true } -guillotiere = { version = "0.6.2", optional = true } -smallvec = { workspace = true, optional = true } +guillotiere = { version = "0.6.2" } +smallvec = { workspace = true } diff --git a/vello_encoding/src/encoding.rs b/vello_encoding/src/encoding.rs index bfcc3596e..9c1cf46d9 100644 --- a/vello_encoding/src/encoding.rs +++ b/vello_encoding/src/encoding.rs @@ -1,21 +1,15 @@ // Copyright 2022 the Vello Authors // SPDX-License-Identifier: Apache-2.0 OR MIT -use super::{DrawBlurRoundedRect, DrawColor, DrawTag, PathEncoder, PathTag, Style, Transform}; +use super::{ + DrawBlurRoundedRect, DrawColor, DrawImage, DrawLinearGradient, DrawRadialGradient, + DrawSweepGradient, DrawTag, Glyph, GlyphRun, Patch, PathEncoder, PathTag, Style, Transform, +}; +use peniko::color::{palette, DynamicColor}; use peniko::kurbo::{Shape, Stroke}; -use peniko::{BlendMode, BrushRef, Fill}; - -#[cfg(feature = "full")] -use { - super::{ - DrawImage, DrawLinearGradient, DrawRadialGradient, DrawSweepGradient, Glyph, GlyphRun, - Patch, - }, - peniko::color::{palette, DynamicColor}, - peniko::{ColorStop, Extend, GradientKind, Image}, - skrifa::instance::NormalizedCoord, -}; +use peniko::{BlendMode, BrushRef, ColorStop, Extend, Fill, GradientKind, Image}; +use skrifa::instance::NormalizedCoord; /// Encoded data streams for a scene. /// @@ -38,7 +32,6 @@ pub struct Encoding { /// The style stream pub styles: Vec