Skip to content

Commit 396c618

Browse files
maxmmitchellcopybara-github
authored andcommitted
Populate min_version BrushFamily proto field.
Introduces code to calculate the minimum required version of Ink for a BrushFamily (and each part of a BrushFamily). The code is used during serialization to compute the value to store in the `min_version` field. During deserialization, the `min_version` field is used to determine if a BrushFamily is compatible with the current version of Ink; if it isn't, decoding it is aborted. To ensure the code in the web of `CalculateMinimumRequiredVersion` functions lines up with expectations, protobuf options are used to build consistency check tests. `CalculateMinimumRequiredVersion` serves as the enforcement of the expectations set in the protobuf itself. The tests are: * A fuzz test to generate valid brush families and serialize them. Then, it checks the value in `min_version` against all the options set for the fields, messages, and enum values, to ensure it is equal to the highest value set for the relevant options. This ensures `CalculateMinimumRequiredVersion` is consistent with the protobuf options. * A test to iterate over all the messages, fields, and enum values in `brush_family.proto`, starting at the top-level `BrushFamily` message, and verify that they all have a relevant `field_min_version`, `message_min_version`, or `enum_value_min_version` set, and that this value set is less than or equal to the maximum compatible version (`version::kMax`). * A test to verify that decoding a `proto::Version` out of the acceptable range (higher than `version::kMax`, lower than `version::kMin`, any version with `release < 1`, any stable version with `release != 1`) will fail. * A test to verify that decoding a `proto::Version` with an unrecognized `proto::Version::Cycle` enum value will fail. * A test to verify that decoding a `proto::BrushFamily` with no value set for its `min_version` field will ***not*** fail, to ensure older brushes are still able to be loaded. A more direct implementation, using reflection to examine the descriptors of the protobuf directly during serialization, was considered, but ultimately rejected. It would have required both static and runtime reflection, and increased `libink.so` size by ~2%. PiperOrigin-RevId: 872916698
1 parent 40bfce5 commit 396c618

23 files changed

+2934
-224
lines changed

ink/brush/BUILD.bazel

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ cc_library(
8282
srcs = ["brush_coat.cc"],
8383
hdrs = ["brush_coat.h"],
8484
deps = [
85-
":brush_behavior",
8685
":brush_paint",
8786
":brush_tip",
87+
":version",
8888
"//ink/geometry:mesh_format",
8989
"@com_google_absl//absl/container:flat_hash_set",
9090
"@com_google_absl//absl/container:inlined_vector",
@@ -120,6 +120,7 @@ cc_library(
120120
":brush_coat",
121121
":brush_paint",
122122
":brush_tip",
123+
":version",
123124
"//ink/types:duration",
124125
"@com_google_absl//absl/status",
125126
"@com_google_absl//absl/status:statusor",
@@ -160,6 +161,7 @@ cc_library(
160161
hdrs = ["brush_tip.h"],
161162
deps = [
162163
":brush_behavior",
164+
":version",
163165
"//ink/geometry:angle",
164166
"//ink/geometry:mesh_format",
165167
"//ink/geometry:vec",
@@ -190,6 +192,7 @@ cc_library(
190192
srcs = ["color_function.cc"],
191193
hdrs = ["color_function.h"],
192194
deps = [
195+
":version",
193196
"//ink/color",
194197
"@com_google_absl//absl/status",
195198
"@com_google_absl//absl/strings",
@@ -219,6 +222,7 @@ cc_library(
219222
srcs = ["easing_function.cc"],
220223
hdrs = ["easing_function.h"],
221224
deps = [
225+
":version",
222226
"//ink/geometry:point",
223227
"@com_google_absl//absl/status",
224228
"@com_google_absl//absl/strings",
@@ -245,6 +249,7 @@ cc_library(
245249
hdrs = ["brush_behavior.h"],
246250
deps = [
247251
":easing_function",
252+
":version",
248253
"@com_google_absl//absl/status",
249254
"@com_google_absl//absl/strings",
250255
"@com_google_absl//absl/strings:str_format",
@@ -273,6 +278,7 @@ cc_library(
273278
hdrs = ["brush_paint.h"],
274279
deps = [
275280
":color_function",
281+
":version",
276282
"//ink/geometry:angle",
277283
"//ink/geometry:mesh_format",
278284
"//ink/geometry:vec",
@@ -365,6 +371,15 @@ cc_library(
365371
],
366372
)
367373

374+
cc_library(
375+
name = "version",
376+
hdrs = ["version.h"],
377+
deps = [
378+
"@com_google_absl//absl/status",
379+
"@com_google_absl//absl/strings",
380+
],
381+
)
382+
368383
cc_test(
369384
name = "stock_brushes_test",
370385
srcs = ["stock_brushes_test.cc"],

ink/brush/brush_behavior.cc

Lines changed: 217 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include "ink/brush/brush_behavior.h"
1616

17+
#include <algorithm>
1718
#include <array>
1819
#include <cmath>
1920
#include <cstddef>
@@ -25,6 +26,7 @@
2526
#include "absl/strings/str_format.h"
2627
#include "absl/strings/str_join.h"
2728
#include "ink/brush/easing_function.h"
29+
#include "ink/brush/version.h"
2830

2931
namespace ink {
3032

@@ -476,6 +478,221 @@ absl::Status ValidateBrushBehavior(const BrushBehavior& behavior) {
476478
return absl::OkStatus();
477479
}
478480

481+
namespace {
482+
483+
Version CalculateMinimumRequiredVersion(BrushBehavior::Source source) {
484+
switch (source) {
485+
case BrushBehavior::Source::kNormalizedPressure:
486+
case BrushBehavior::Source::kTiltInRadians:
487+
case BrushBehavior::Source::kTiltXInRadians:
488+
case BrushBehavior::Source::kTiltYInRadians:
489+
case BrushBehavior::Source::kOrientationInRadians:
490+
case BrushBehavior::Source::kOrientationAboutZeroInRadians:
491+
case BrushBehavior::Source::kSpeedInMultiplesOfBrushSizePerSecond:
492+
case BrushBehavior::Source::kVelocityXInMultiplesOfBrushSizePerSecond:
493+
case BrushBehavior::Source::kVelocityYInMultiplesOfBrushSizePerSecond:
494+
case BrushBehavior::Source::kDirectionInRadians:
495+
case BrushBehavior::Source::kDirectionAboutZeroInRadians:
496+
case BrushBehavior::Source::kNormalizedDirectionX:
497+
case BrushBehavior::Source::kNormalizedDirectionY:
498+
case BrushBehavior::Source::kDistanceTraveledInMultiplesOfBrushSize:
499+
case BrushBehavior::Source::kTimeOfInputInSeconds:
500+
case BrushBehavior::Source::
501+
kPredictedDistanceTraveledInMultiplesOfBrushSize:
502+
case BrushBehavior::Source::kPredictedTimeElapsedInSeconds:
503+
case BrushBehavior::Source::kDistanceRemainingInMultiplesOfBrushSize:
504+
case BrushBehavior::Source::kTimeSinceInputInSeconds:
505+
case BrushBehavior::Source::
506+
kAccelerationInMultiplesOfBrushSizePerSecondSquared:
507+
case BrushBehavior::Source::
508+
kAccelerationXInMultiplesOfBrushSizePerSecondSquared:
509+
case BrushBehavior::Source::
510+
kAccelerationYInMultiplesOfBrushSizePerSecondSquared:
511+
case BrushBehavior::Source::
512+
kAccelerationForwardInMultiplesOfBrushSizePerSecondSquared:
513+
case BrushBehavior::Source::
514+
kAccelerationLateralInMultiplesOfBrushSizePerSecondSquared:
515+
case BrushBehavior::Source::kInputSpeedInCentimetersPerSecond:
516+
case BrushBehavior::Source::kInputVelocityXInCentimetersPerSecond:
517+
case BrushBehavior::Source::kInputVelocityYInCentimetersPerSecond:
518+
case BrushBehavior::Source::kInputDistanceTraveledInCentimeters:
519+
case BrushBehavior::Source::kPredictedInputDistanceTraveledInCentimeters:
520+
case BrushBehavior::Source::kInputAccelerationInCentimetersPerSecondSquared:
521+
case BrushBehavior::Source::
522+
kInputAccelerationXInCentimetersPerSecondSquared:
523+
case BrushBehavior::Source::
524+
kInputAccelerationYInCentimetersPerSecondSquared:
525+
case BrushBehavior::Source::
526+
kInputAccelerationForwardInCentimetersPerSecondSquared:
527+
case BrushBehavior::Source::
528+
kInputAccelerationLateralInCentimetersPerSecondSquared:
529+
case BrushBehavior::Source::kDistanceRemainingAsFractionOfStrokeLength:
530+
return version::k1_0_0;
531+
}
532+
}
533+
534+
Version CalculateMinimumRequiredVersion(BrushBehavior::Target target) {
535+
switch (target) {
536+
case BrushBehavior::Target::kWidthMultiplier:
537+
case BrushBehavior::Target::kHeightMultiplier:
538+
case BrushBehavior::Target::kSizeMultiplier:
539+
case BrushBehavior::Target::kSlantOffsetInRadians:
540+
case BrushBehavior::Target::kPinchOffset:
541+
case BrushBehavior::Target::kRotationOffsetInRadians:
542+
case BrushBehavior::Target::kCornerRoundingOffset:
543+
case BrushBehavior::Target::kPositionOffsetXInMultiplesOfBrushSize:
544+
case BrushBehavior::Target::kPositionOffsetYInMultiplesOfBrushSize:
545+
case BrushBehavior::Target::kPositionOffsetForwardInMultiplesOfBrushSize:
546+
case BrushBehavior::Target::kPositionOffsetLateralInMultiplesOfBrushSize:
547+
case BrushBehavior::Target::kTextureAnimationProgressOffset:
548+
case BrushBehavior::Target::kHueOffsetInRadians:
549+
case BrushBehavior::Target::kSaturationMultiplier:
550+
case BrushBehavior::Target::kLuminosity:
551+
case BrushBehavior::Target::kOpacityMultiplier:
552+
return version::k1_0_0;
553+
}
554+
}
555+
556+
Version CalculateMinimumRequiredVersion(BrushBehavior::PolarTarget target) {
557+
switch (target) {
558+
case BrushBehavior::PolarTarget::
559+
kPositionOffsetAbsoluteInRadiansAndMultiplesOfBrushSize:
560+
case BrushBehavior::PolarTarget::
561+
kPositionOffsetRelativeInRadiansAndMultiplesOfBrushSize:
562+
return version::k1_0_0;
563+
}
564+
}
565+
566+
Version CalculateMinimumRequiredVersion(
567+
BrushBehavior::OutOfRange out_of_range) {
568+
switch (out_of_range) {
569+
case BrushBehavior::OutOfRange::kClamp:
570+
case BrushBehavior::OutOfRange::kMirror:
571+
case BrushBehavior::OutOfRange::kRepeat:
572+
return version::k1_0_0;
573+
}
574+
}
575+
576+
Version CalculateMinimumRequiredVersion(
577+
BrushBehavior::EnabledToolTypes enabled) {
578+
return version::k1_0_0;
579+
}
580+
581+
Version CalculateMinimumRequiredVersion(
582+
BrushBehavior::OptionalInputProperty input) {
583+
switch (input) {
584+
case BrushBehavior::OptionalInputProperty::kPressure:
585+
case BrushBehavior::OptionalInputProperty::kTilt:
586+
case BrushBehavior::OptionalInputProperty::kOrientation:
587+
case BrushBehavior::OptionalInputProperty::kTiltXAndY:
588+
return version::k1_0_0;
589+
}
590+
}
591+
592+
Version CalculateMinimumRequiredVersion(BrushBehavior::BinaryOp operation) {
593+
switch (operation) {
594+
case BrushBehavior::BinaryOp::kProduct:
595+
case BrushBehavior::BinaryOp::kSum:
596+
return version::k1_0_0;
597+
case BrushBehavior::BinaryOp::kMin:
598+
case BrushBehavior::BinaryOp::kMax:
599+
case BrushBehavior::BinaryOp::kAndThen:
600+
case BrushBehavior::BinaryOp::kOrElse:
601+
case BrushBehavior::BinaryOp::kXorElse:
602+
return version::k1_1_0_alpha_01;
603+
}
604+
}
605+
606+
Version CalculateMinimumRequiredVersion(
607+
BrushBehavior::ProgressDomain progress_domain) {
608+
switch (progress_domain) {
609+
case BrushBehavior::ProgressDomain::kDistanceInCentimeters:
610+
case BrushBehavior::ProgressDomain::kDistanceInMultiplesOfBrushSize:
611+
case BrushBehavior::ProgressDomain::kTimeInSeconds:
612+
return version::k1_0_0;
613+
}
614+
}
615+
616+
Version CalculateMinimumRequiredVersion(
617+
BrushBehavior::Interpolation interpolation) {
618+
switch (interpolation) {
619+
case BrushBehavior::Interpolation::kLerp:
620+
case BrushBehavior::Interpolation::kInverseLerp:
621+
return version::k1_0_0;
622+
}
623+
}
624+
625+
Version CalculateMinimumRequiredVersion(BrushBehavior::SourceNode node) {
626+
return std::max(
627+
CalculateMinimumRequiredVersion(node.source_out_of_range_behavior),
628+
CalculateMinimumRequiredVersion(node.source));
629+
}
630+
631+
Version CalculateMinimumRequiredVersion(BrushBehavior::ConstantNode node) {
632+
return version::k1_0_0;
633+
}
634+
635+
Version CalculateMinimumRequiredVersion(BrushBehavior::NoiseNode node) {
636+
return CalculateMinimumRequiredVersion(node.vary_over);
637+
}
638+
639+
Version CalculateMinimumRequiredVersion(
640+
BrushBehavior::FallbackFilterNode node) {
641+
return CalculateMinimumRequiredVersion(node.is_fallback_for);
642+
}
643+
644+
Version CalculateMinimumRequiredVersion(
645+
BrushBehavior::ToolTypeFilterNode node) {
646+
return CalculateMinimumRequiredVersion(node.enabled_tool_types);
647+
}
648+
649+
Version CalculateMinimumRequiredVersion(BrushBehavior::DampingNode node) {
650+
return CalculateMinimumRequiredVersion(node.damping_source);
651+
}
652+
653+
Version CalculateMinimumRequiredVersion(BrushBehavior::ResponseNode node) {
654+
return brush_internal::CalculateMinimumRequiredVersion(node.response_curve);
655+
}
656+
657+
Version CalculateMinimumRequiredVersion(BrushBehavior::IntegralNode node) {
658+
return std::max(
659+
{version::k1_1_0_alpha_01,
660+
CalculateMinimumRequiredVersion(node.integrate_over),
661+
CalculateMinimumRequiredVersion(node.integral_out_of_range_behavior)});
662+
}
663+
664+
Version CalculateMinimumRequiredVersion(BrushBehavior::BinaryOpNode node) {
665+
return CalculateMinimumRequiredVersion(node.operation);
666+
}
667+
668+
Version CalculateMinimumRequiredVersion(BrushBehavior::InterpolationNode node) {
669+
return CalculateMinimumRequiredVersion(node.interpolation);
670+
}
671+
672+
Version CalculateMinimumRequiredVersion(BrushBehavior::TargetNode node) {
673+
return CalculateMinimumRequiredVersion(node.target);
674+
}
675+
676+
Version CalculateMinimumRequiredVersion(BrushBehavior::PolarTargetNode node) {
677+
return CalculateMinimumRequiredVersion(node.target);
678+
}
679+
680+
Version CalculateMinimumRequiredVersion(const BrushBehavior::Node& node) {
681+
return std::visit(
682+
[](const auto& node) { return CalculateMinimumRequiredVersion(node); },
683+
node);
684+
}
685+
686+
} // namespace
687+
688+
Version CalculateMinimumRequiredVersion(const BrushBehavior& behavior) {
689+
Version max_version = version::k1_0_0;
690+
for (const BrushBehavior::Node& node : behavior.nodes) {
691+
max_version = std::max(max_version, CalculateMinimumRequiredVersion(node));
692+
}
693+
return max_version;
694+
}
695+
479696
std::string ToFormattedString(BrushBehavior::Source source) {
480697
switch (source) {
481698
case BrushBehavior::Source::kNormalizedPressure:

ink/brush/brush_behavior.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
#include "absl/status/status.h"
2525
#include "ink/brush/easing_function.h"
26+
#include "ink/brush/version.h"
2627

2728
namespace ink {
2829

@@ -693,6 +694,10 @@ absl::Status ValidateBrushBehaviorTopLevel(const BrushBehavior& behavior);
693694

694695
absl::Status ValidateBrushBehaviorNode(const BrushBehavior::Node& node);
695696

697+
// Calculates the minimum version of the Ink library that is required to use
698+
// this brush behavior.
699+
Version CalculateMinimumRequiredVersion(const BrushBehavior& behavior);
700+
696701
std::string ToFormattedString(BrushBehavior::Source source);
697702
std::string ToFormattedString(BrushBehavior::Target target);
698703
std::string ToFormattedString(BrushBehavior::PolarTarget target);

ink/brush/brush_coat.cc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414

1515
#include "ink/brush/brush_coat.h"
1616

17+
#include <algorithm>
1718
#include <string>
1819

1920
#include "absl/container/flat_hash_set.h"
2021
#include "absl/status/status.h"
2122
#include "absl/strings/str_cat.h"
2223
#include "absl/strings/str_format.h"
2324
#include "absl/strings/str_join.h"
24-
#include "ink/brush/brush_behavior.h"
2525
#include "ink/brush/brush_paint.h"
2626
#include "ink/brush/brush_tip.h"
27+
#include "ink/brush/version.h"
2728
#include "ink/geometry/mesh_format.h"
2829

2930
namespace ink {
@@ -45,6 +46,14 @@ absl::Status ValidateBrushCoat(const BrushCoat& coat) {
4546
return absl::OkStatus();
4647
}
4748

49+
Version CalculateMinimumRequiredVersion(const BrushCoat& coat) {
50+
Version max_version = CalculateMinimumRequiredVersion(coat.tip);
51+
for (const BrushPaint& paint : coat.paint_preferences) {
52+
max_version = std::max(max_version, CalculateMinimumRequiredVersion(paint));
53+
}
54+
return max_version;
55+
}
56+
4857
void AddAttributeIdsRequiredByCoat(
4958
const BrushCoat& coat,
5059
absl::flat_hash_set<MeshFormat::AttributeId>& attribute_ids) {

ink/brush/brush_coat.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "absl/status/status.h"
2323
#include "ink/brush/brush_paint.h"
2424
#include "ink/brush/brush_tip.h"
25+
#include "ink/brush/version.h"
2526
#include "ink/geometry/mesh_format.h"
2627

2728
namespace ink {
@@ -46,6 +47,10 @@ namespace brush_internal {
4647
// BrushFamily, and returns an error if not.
4748
absl::Status ValidateBrushCoat(const BrushCoat& coat);
4849

50+
// Calculates the minimum version of the Ink library that is required to use
51+
// this brush coat.
52+
Version CalculateMinimumRequiredVersion(const BrushCoat& coat);
53+
4954
// Adds the mesh attribute IDs that are required to properly render a mesh
5055
// made with this brush coat to the given `attribute_ids` set. This will always
5156
// include `kPosition` and certain other attribute IDs (`kSideDerivative`,

0 commit comments

Comments
 (0)