Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Impeller] skip mip generation if blur downsample is factor is 0.5 or greater #53635

Closed
wants to merge 2 commits into from
Closed

[Impeller] skip mip generation if blur downsample is factor is 0.5 or greater #53635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfafc28
[Impeller] skip mip generation if blur downsample is factor is 0.5 or…
jonahwilliams Jun 28, 2024
2692533
remove mip error testing.
jonahwilliams Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions impeller/aiks/aiks_blur_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,6 @@ TEST_P(AiksTest, GaussianBlurAllocatesCorrectMipCountRenderTarget) {
}

TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) {
fml::testing::LogCapture log_capture;
size_t blur_required_mip_count =
GetParam() == PlaygroundBackend::kOpenGLES ? 1 : 4;

Expand All @@ -1107,22 +1106,11 @@ TEST_P(AiksTest, GaussianBlurMipMapNestedLayer) {
max_mip_count = std::max(it->config.mip_count, max_mip_count);
}
EXPECT_EQ(max_mip_count, blur_required_mip_count);
// The log is FML_DLOG, so only check in debug builds.
#ifndef NDEBUG
if (GetParam() != PlaygroundBackend::kOpenGLES) {
EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
std::string::npos);
} else {
EXPECT_NE(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
std::string::npos);
}
#endif
}

TEST_P(AiksTest, GaussianBlurMipMapImageFilter) {
size_t blur_required_mip_count =
GetParam() == PlaygroundBackend::kOpenGLES ? 1 : 4;
fml::testing::LogCapture log_capture;
Canvas canvas;
canvas.SaveLayer(
{.image_filter = ImageFilter::MakeBlur(Sigma(30), Sigma(30),
Expand All @@ -1142,22 +1130,11 @@ TEST_P(AiksTest, GaussianBlurMipMapImageFilter) {
max_mip_count = std::max(it->config.mip_count, max_mip_count);
}
EXPECT_EQ(max_mip_count, blur_required_mip_count);
// The log is FML_DLOG, so only check in debug builds.
#ifndef NDEBUG
if (GetParam() != PlaygroundBackend::kOpenGLES) {
EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
std::string::npos);
} else {
EXPECT_NE(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
std::string::npos);
}
#endif
}

TEST_P(AiksTest, GaussianBlurMipMapSolidColor) {
size_t blur_required_mip_count =
GetParam() == PlaygroundBackend::kOpenGLES ? 1 : 4;
fml::testing::LogCapture log_capture;
Canvas canvas;
canvas.DrawPath(PathBuilder{}
.MoveTo({100, 100})
Expand All @@ -1183,16 +1160,6 @@ TEST_P(AiksTest, GaussianBlurMipMapSolidColor) {
max_mip_count = std::max(it->config.mip_count, max_mip_count);
}
EXPECT_EQ(max_mip_count, blur_required_mip_count);
// The log is FML_DLOG, so only check in debug builds.
#ifndef NDEBUG
if (GetParam() != PlaygroundBackend::kOpenGLES) {
EXPECT_EQ(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
std::string::npos);
} else {
EXPECT_NE(log_capture.str().find(GaussianBlurFilterContents::kNoMipsError),
std::string::npos);
}
#endif
}

TEST_P(AiksTest, MaskBlurDoesntStretchContents) {
Expand Down
41 changes: 25 additions & 16 deletions impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
#include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"

#include <cmath>
#include <optional>

#include "flutter/fml/make_copyable.h"
#include "impeller/core/formats.h"
#include "impeller/entity/contents/clip_contents.h"
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/texture_fill.frag.h"
#include "impeller/entity/texture_fill.vert.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/texture_mipmap.h"
#include "impeller/renderer/vertex_buffer_builder.h"

namespace impeller {
Expand Down Expand Up @@ -147,12 +150,6 @@ std::optional<Snapshot> GetSnapshot(const std::shared_ptr<FilterInput>& input,
return std::nullopt;
}

// In order to avoid shimmering in downsampling step, we should have mips.
if (input_snapshot->texture->GetMipCount() <= 1) {
FML_DLOG(ERROR) << GaussianBlurFilterContents::kNoMipsError;
}
FML_DCHECK(!input_snapshot->texture->NeedsMipmapGeneration());

return input_snapshot;
}

Expand Down Expand Up @@ -242,9 +239,6 @@ DownsamplePassArgs CalculateDownsamplePassArgs(
Scalar desired_scalar =
std::min(GaussianBlurFilterContents::CalculateScale(scaled_sigma.x),
GaussianBlurFilterContents::CalculateScale(scaled_sigma.y));
// TODO(jonahwilliams): If desired_scalar is 1.0 and we fully acquired the
// gutter from the expanded_coverage_hint, we can skip the downsample pass.
// pass.
Vector2 downsample_scalar(desired_scalar, desired_scalar);
// TODO(gaaclarke): The padding could be removed if we know it's not needed or
// resized to account for the expanded_clip_coverage. There doesn't appear
Expand Down Expand Up @@ -326,7 +320,8 @@ fml::StatusOr<RenderTarget> MakeDownsampleSubpass(
std::shared_ptr<Texture> input_texture,
const SamplerDescriptor& sampler_descriptor,
const DownsamplePassArgs& pass_args,
Entity::TileMode tile_mode) {
Entity::TileMode tile_mode,
bool min_lod_clamp) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
bool min_lod_clamp) {
bool use_base_mip) {

ContentContext::SubpassCallback subpass_callback =
[&](const ContentContext& renderer, RenderPass& pass) {
HostBuffer& host_buffer = renderer.GetTransientsBuffer();
Expand Down Expand Up @@ -356,6 +351,9 @@ fml::StatusOr<RenderTarget> MakeDownsampleSubpass(
SetTileMode(&linear_sampler_descriptor, renderer, tile_mode);
linear_sampler_descriptor.mag_filter = MinMagFilter::kLinear;
linear_sampler_descriptor.min_filter = MinMagFilter::kLinear;
if (min_lod_clamp) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With a downsample factor of 0.5, by default we will try to sample from mip level 1 instead of 0. But forcing 0 and using linear filtering is sufficient to not lose quality.

linear_sampler_descriptor.mip_filter = MipFilter::kBase;
}
TextureFillVertexShader::BindFrameInfo(
pass, host_buffer.EmplaceUniform(frame_info));
TextureFillFragmentShader::BindFragInfo(
Expand Down Expand Up @@ -537,9 +535,6 @@ Entity ApplyBlurStyle(FilterContents::BlurStyle blur_style,
}
} // namespace

std::string_view GaussianBlurFilterContents::kNoMipsError =
"Applying gaussian blur without mipmap.";

GaussianBlurFilterContents::GaussianBlurFilterContents(
Scalar sigma_x,
Scalar sigma_y,
Expand Down Expand Up @@ -679,9 +674,23 @@ std::optional<Entity> GaussianBlurFilterContents::RenderFilter(
blur_info.scaled_sigma, blur_info.padding, input_snapshot.value(),
source_expanded_coverage_hint, inputs[0], snapshot_entity);

fml::StatusOr<RenderTarget> pass1_out = MakeDownsampleSubpass(
renderer, command_buffer, input_snapshot->texture,
input_snapshot->sampler_descriptor, downsample_pass_args, tile_mode_);
// If a blur scalar is less than 0.5, generate mipmaps. Otherwise, the
// bilinear filtering of the base mip level is sufficient to preserve quality.
bool generated_mips = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
bool generated_mips = false;
bool use_base_mip = true;

if (downsample_pass_args.effective_scalar.x < 0.5 ||
downsample_pass_args.effective_scalar.y < 0.5) {
if (!AddMipmapGeneration(command_buffer, renderer.GetContext(),
input_snapshot->texture)
.ok()) {
return std::nullopt;
}
generated_mips = true;
}

fml::StatusOr<RenderTarget> pass1_out =
MakeDownsampleSubpass(renderer, command_buffer, input_snapshot->texture,
input_snapshot->sampler_descriptor,
downsample_pass_args, tile_mode_, !generated_mips);

if (!pass1_out.ok()) {
return std::nullopt;
Expand Down
9 changes: 0 additions & 9 deletions impeller/entity/inline_pass_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,6 @@ bool InlinePassContext::EndPass() {
return false;
}

const std::shared_ptr<Texture>& target_texture =
GetPassTarget().GetRenderTarget().GetRenderTargetTexture();
if (target_texture->GetMipCount() > 1) {
fml::Status mip_status = AddMipmapGeneration(
command_buffer_, renderer_.GetContext(), target_texture);
if (!mip_status.ok()) {
return false;
}
}
if (!renderer_.GetContext()
->GetCommandQueue()
->Submit({std::move(command_buffer_)})
Expand Down