[Impeller] dont print format strings for blend filter and snapshots. (#57105)
We can use a macro to distinguish between all of the blend modes. We don't need to distinguish between porter duff/ advanced /pipeline as the pipeline is already labeled with the shader used.
For all snapshots the additional label on the texture isn't useful since we can just look at the command.
diff --git a/impeller/entity/contents/contents.cc b/impeller/entity/contents/contents.cc
index 6099861..21d7ebf 100644
--- a/impeller/entity/contents/contents.cc
+++ b/impeller/entity/contents/contents.cc
@@ -60,7 +60,7 @@
const std::optional<SamplerDescriptor>& sampler_descriptor,
bool msaa_enabled,
int32_t mip_count,
- const std::string& label) const {
+ std::string_view label) const {
auto coverage = GetCoverage(entity);
if (!coverage.has_value()) {
return std::nullopt;
diff --git a/impeller/entity/contents/contents.h b/impeller/entity/contents/contents.h
index 31a8aed..2672136 100644
--- a/impeller/entity/contents/contents.h
+++ b/impeller/entity/contents/contents.h
@@ -95,7 +95,7 @@
const std::optional<SamplerDescriptor>& sampler_descriptor = std::nullopt,
bool msaa_enabled = true,
int32_t mip_count = 1,
- const std::string& label = "Snapshot") const;
+ std::string_view label = "Snapshot") const;
//----------------------------------------------------------------------------
/// @brief Return the color source's intrinsic size, if available.
diff --git a/impeller/entity/contents/filters/blend_filter_contents.cc b/impeller/entity/contents/filters/blend_filter_contents.cc
index 3f07150..e749be2 100644
--- a/impeller/entity/contents/filters/blend_filter_contents.cc
+++ b/impeller/entity/contents/filters/blend_filter_contents.cc
@@ -30,6 +30,24 @@
namespace impeller {
+namespace {
+
+#ifdef IMPELLER_DEBUG
+
+#define _IMPELLER_BLEND_MODE_FILTER_NAME_LIST(blend_mode) \
+ "Blend Filter " #blend_mode,
+
+static constexpr const char* kBlendModeFilterNames[] = {
+ IMPELLER_FOR_EACH_BLEND_MODE(_IMPELLER_BLEND_MODE_FILTER_NAME_LIST)};
+
+const std::string_view BlendModeToFilterString(BlendMode blend_mode) {
+ return kBlendModeFilterNames[static_cast<std::underlying_type_t<BlendMode>>(
+ blend_mode)];
+}
+#endif // IMPELLER_DEBUG
+
+} // namespace
+
std::optional<BlendMode> InvertPorterDuffBlend(BlendMode blend_mode) {
switch (blend_mode) {
case BlendMode::kClear:
@@ -173,8 +191,7 @@
PipelineRef pipeline = std::invoke(pipeline_proc, renderer, options);
#ifdef IMPELLER_DEBUG
- pass.SetCommandLabel(
- SPrintF("Advanced Blend Filter (%s)", BlendModeToString(blend_mode)));
+ pass.SetCommandLabel(BlendModeToFilterString(blend_mode));
#endif // IMPELLER_DEBUG
pass.SetVertexBuffer(std::move(vtx_buffer));
pass.SetPipeline(pipeline);
@@ -296,8 +313,7 @@
CreateVertexBuffer(vertices, renderer.GetTransientsBuffer());
#ifdef IMPELLER_DEBUG
- pass.SetCommandLabel(SPrintF("Foreground Advanced Blend Filter (%s)",
- BlendModeToString(blend_mode)));
+ pass.SetCommandLabel(BlendModeToFilterString(blend_mode));
#endif // IMPELLER_DEBUG
pass.SetVertexBuffer(std::move(vtx_buffer));
auto options = OptionsFromPassAndEntity(pass, entity);
@@ -449,8 +465,7 @@
CreateVertexBuffer(vertices, renderer.GetTransientsBuffer());
#ifdef IMPELLER_DEBUG
- pass.SetCommandLabel(SPrintF("Foreground PorterDuff Blend Filter (%s)",
- BlendModeToString(blend_mode)));
+ pass.SetCommandLabel(BlendModeToFilterString(blend_mode));
#endif // IMPELLER_DEBUG
pass.SetVertexBuffer(std::move(vtx_buffer));
auto options = OptionsFromPassAndEntity(pass, entity);
@@ -548,8 +563,7 @@
auto& host_buffer = renderer.GetTransientsBuffer();
#ifdef IMPELLER_DEBUG
- pass.SetCommandLabel(
- SPrintF("Pipeline Blend Filter (%s)", BlendModeToString(blend_mode)));
+ pass.SetCommandLabel(BlendModeToFilterString(blend_mode));
#endif // IMPELLER_DEBUG
auto options = OptionsFromPass(pass);
options.primitive_type = PrimitiveType::kTriangleStrip;
diff --git a/impeller/entity/contents/filters/filter_contents.cc b/impeller/entity/contents/filters/filter_contents.cc
index ddfaa2c..9d42ad1 100644
--- a/impeller/entity/contents/filters/filter_contents.cc
+++ b/impeller/entity/contents/filters/filter_contents.cc
@@ -253,7 +253,7 @@
const std::optional<SamplerDescriptor>& sampler_descriptor,
bool msaa_enabled,
int32_t mip_count,
- const std::string& label) const {
+ std::string_view label) const {
// Resolve the render instruction (entity) from the filter and render it to a
// snapshot.
if (std::optional<Entity> result =
@@ -266,7 +266,8 @@
std::nullopt, // sampler_descriptor
true, // msaa_enabled
/*mip_count=*/mip_count,
- label); // label
+ label // label
+ );
}
return std::nullopt;
diff --git a/impeller/entity/contents/filters/filter_contents.h b/impeller/entity/contents/filters/filter_contents.h
index 3177cf7..baa168f 100644
--- a/impeller/entity/contents/filters/filter_contents.h
+++ b/impeller/entity/contents/filters/filter_contents.h
@@ -126,7 +126,7 @@
const std::optional<SamplerDescriptor>& sampler_descriptor = std::nullopt,
bool msaa_enabled = true,
int32_t mip_count = 1,
- const std::string& label = "Filter Snapshot") const override;
+ std::string_view label = "Filter Snapshot") const override;
/// @brief Determines the coverage of source pixels that will be needed
/// to produce results for the specified |output_limit| under the
diff --git a/impeller/entity/contents/filters/inputs/contents_filter_input.cc b/impeller/entity/contents/filters/inputs/contents_filter_input.cc
index 57a6874..9be1218 100644
--- a/impeller/entity/contents/filters/inputs/contents_filter_input.cc
+++ b/impeller/entity/contents/filters/inputs/contents_filter_input.cc
@@ -7,8 +7,6 @@
#include <optional>
#include <utility>
-#include "impeller/base/strings.h"
-
namespace impeller {
ContentsFilterInput::ContentsFilterInput(std::shared_ptr<Contents> contents,
@@ -18,7 +16,7 @@
ContentsFilterInput::~ContentsFilterInput() = default;
std::optional<Snapshot> ContentsFilterInput::GetSnapshot(
- const std::string& label,
+ std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit,
@@ -27,14 +25,14 @@
coverage_limit = entity.GetContents()->GetCoverageHint();
}
if (!snapshot_.has_value()) {
- snapshot_ = contents_->RenderToSnapshot(
- renderer, // renderer
- entity, // entity
- coverage_limit, // coverage_limit
- std::nullopt, // sampler_descriptor
- msaa_enabled_, // msaa_enabled
- /*mip_count=*/mip_count,
- SPrintF("Contents to %s Filter Snapshot", label.c_str())); // label
+ snapshot_ = contents_->RenderToSnapshot(renderer, // renderer
+ entity, // entity
+ coverage_limit, // coverage_limit
+ std::nullopt, // sampler_descriptor
+ msaa_enabled_, // msaa_enabled
+ /*mip_count=*/mip_count, //
+ label //
+ );
}
return snapshot_;
}
diff --git a/impeller/entity/contents/filters/inputs/contents_filter_input.h b/impeller/entity/contents/filters/inputs/contents_filter_input.h
index 0a43968..42258f3 100644
--- a/impeller/entity/contents/filters/inputs/contents_filter_input.h
+++ b/impeller/entity/contents/filters/inputs/contents_filter_input.h
@@ -14,7 +14,7 @@
~ContentsFilterInput() override;
// |FilterInput|
- std::optional<Snapshot> GetSnapshot(const std::string& label,
+ std::optional<Snapshot> GetSnapshot(std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit,
diff --git a/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc b/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc
index 9eb01a7..1000090 100644
--- a/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc
+++ b/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc
@@ -18,20 +18,19 @@
FilterContentsFilterInput::~FilterContentsFilterInput() = default;
std::optional<Snapshot> FilterContentsFilterInput::GetSnapshot(
- const std::string& label,
+ std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit,
int32_t mip_count) const {
if (!snapshot_.has_value()) {
- snapshot_ = filter_->RenderToSnapshot(
- renderer, // renderer
- entity, // entity
- coverage_limit, // coverage_limit
- std::nullopt, // sampler_descriptor
- true, // msaa_enabled
- /*mip_count=*/mip_count,
- SPrintF("Filter to %s Filter Snapshot", label.c_str())); // label
+ snapshot_ = filter_->RenderToSnapshot(renderer, // renderer
+ entity, // entity
+ coverage_limit, // coverage_limit
+ std::nullopt, // sampler_descriptor
+ true, // msaa_enabled
+ /*mip_count=*/mip_count, //
+ label); // label
}
return snapshot_;
}
diff --git a/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h b/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h
index d1f42f3..9bcac00 100644
--- a/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h
+++ b/impeller/entity/contents/filters/inputs/filter_contents_filter_input.h
@@ -14,7 +14,7 @@
~FilterContentsFilterInput() override;
// |FilterInput|
- std::optional<Snapshot> GetSnapshot(const std::string& label,
+ std::optional<Snapshot> GetSnapshot(std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit,
diff --git a/impeller/entity/contents/filters/inputs/filter_input.h b/impeller/entity/contents/filters/inputs/filter_input.h
index e8edd04..7888ac6 100644
--- a/impeller/entity/contents/filters/inputs/filter_input.h
+++ b/impeller/entity/contents/filters/inputs/filter_input.h
@@ -46,7 +46,7 @@
static FilterInput::Vector Make(std::initializer_list<Variant> inputs);
virtual std::optional<Snapshot> GetSnapshot(
- const std::string& label,
+ std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit = std::nullopt,
diff --git a/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc b/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc
index 2742340..0201645 100644
--- a/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc
+++ b/impeller/entity/contents/filters/inputs/placeholder_filter_input.cc
@@ -14,7 +14,7 @@
PlaceholderFilterInput::~PlaceholderFilterInput() = default;
std::optional<Snapshot> PlaceholderFilterInput::GetSnapshot(
- const std::string& label,
+ std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit,
diff --git a/impeller/entity/contents/filters/inputs/placeholder_filter_input.h b/impeller/entity/contents/filters/inputs/placeholder_filter_input.h
index 1096d57..e64688c 100644
--- a/impeller/entity/contents/filters/inputs/placeholder_filter_input.h
+++ b/impeller/entity/contents/filters/inputs/placeholder_filter_input.h
@@ -16,7 +16,7 @@
~PlaceholderFilterInput() override;
// |FilterInput|
- std::optional<Snapshot> GetSnapshot(const std::string& label,
+ std::optional<Snapshot> GetSnapshot(std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit,
diff --git a/impeller/entity/contents/filters/inputs/texture_filter_input.cc b/impeller/entity/contents/filters/inputs/texture_filter_input.cc
index 0e84e740..38ee99a 100644
--- a/impeller/entity/contents/filters/inputs/texture_filter_input.cc
+++ b/impeller/entity/contents/filters/inputs/texture_filter_input.cc
@@ -17,7 +17,7 @@
TextureFilterInput::~TextureFilterInput() = default;
std::optional<Snapshot> TextureFilterInput::GetSnapshot(
- const std::string& label,
+ std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit,
diff --git a/impeller/entity/contents/filters/inputs/texture_filter_input.h b/impeller/entity/contents/filters/inputs/texture_filter_input.h
index 218659b..817dcb3 100644
--- a/impeller/entity/contents/filters/inputs/texture_filter_input.h
+++ b/impeller/entity/contents/filters/inputs/texture_filter_input.h
@@ -16,7 +16,7 @@
~TextureFilterInput() override;
// |FilterInput|
- std::optional<Snapshot> GetSnapshot(const std::string& label,
+ std::optional<Snapshot> GetSnapshot(std::string_view label,
const ContentContext& renderer,
const Entity& entity,
std::optional<Rect> coverage_limit,
diff --git a/impeller/entity/contents/texture_contents.cc b/impeller/entity/contents/texture_contents.cc
index f443558..9e6274c 100644
--- a/impeller/entity/contents/texture_contents.cc
+++ b/impeller/entity/contents/texture_contents.cc
@@ -77,7 +77,7 @@
const std::optional<SamplerDescriptor>& sampler_descriptor,
bool msaa_enabled,
int32_t mip_count,
- const std::string& label) const {
+ std::string_view label) const {
// Passthrough textures that have simple rectangle paths and complete source
// rects.
auto bounds = destination_rect_;
diff --git a/impeller/entity/contents/texture_contents.h b/impeller/entity/contents/texture_contents.h
index 34657ff..92cb29a 100644
--- a/impeller/entity/contents/texture_contents.h
+++ b/impeller/entity/contents/texture_contents.h
@@ -62,7 +62,7 @@
const std::optional<SamplerDescriptor>& sampler_descriptor = std::nullopt,
bool msaa_enabled = true,
int32_t mip_count = 1,
- const std::string& label = "Texture Snapshot") const override;
+ std::string_view label = "Texture Snapshot") const override;
// |Contents|
bool Render(const ContentContext& renderer,
diff --git a/impeller/entity/contents/tiled_texture_contents.cc b/impeller/entity/contents/tiled_texture_contents.cc
index 549abf3..c082155 100644
--- a/impeller/entity/contents/tiled_texture_contents.cc
+++ b/impeller/entity/contents/tiled_texture_contents.cc
@@ -175,7 +175,7 @@
const std::optional<SamplerDescriptor>& sampler_descriptor,
bool msaa_enabled,
int32_t mip_count,
- const std::string& label) const {
+ std::string_view label) const {
std::optional<Rect> geometry_coverage = GetGeometry()->GetCoverage({});
if (GetInverseEffectTransform().IsIdentity() &&
GetGeometry()->IsAxisAlignedRect() &&
diff --git a/impeller/entity/contents/tiled_texture_contents.h b/impeller/entity/contents/tiled_texture_contents.h
index 3c883aa..c10d74f 100644
--- a/impeller/entity/contents/tiled_texture_contents.h
+++ b/impeller/entity/contents/tiled_texture_contents.h
@@ -59,7 +59,7 @@
const std::optional<SamplerDescriptor>& sampler_descriptor = std::nullopt,
bool msaa_enabled = true,
int32_t mip_count = 1,
- const std::string& label = "Tiled Texture Snapshot") const override;
+ std::string_view label = "Tiled Texture Snapshot") const override;
private:
std::shared_ptr<Texture> CreateFilterTexture(
