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

[Impeller] Switch to nearest sampling for the text atlas #39104

Merged
merged 1 commit into from
Jan 25, 2023
Merged

[Impeller] Switch to nearest sampling for the text atlas #39104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions impeller/entity/contents/text_contents.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ static bool CommonRender(
VS::BindFrameInfo(cmd, pass.GetTransientsBuffer().EmplaceUniform(frame_info));

SamplerDescriptor sampler_desc;
sampler_desc.min_filter = MinMagFilter::kLinear;
sampler_desc.mag_filter = MinMagFilter::kLinear;
sampler_desc.min_filter = MinMagFilter::kNearest;
sampler_desc.mag_filter = MinMagFilter::kNearest;
sampler_desc.mip_filter = MipFilter::kNone;

typename FS::FragInfo frag_info;
Expand Down Expand Up @@ -146,10 +146,10 @@ static bool CommonRender(
for (const auto& point : unit_points) {
typename VS::PerVertexData vtx;
vtx.unit_position = point;
vtx.destination_position = offset_glyph_position + Point(0.5, 0.5);
vtx.destination_position = offset_glyph_position;
vtx.destination_size = Point(glyph_position.glyph.bounds.size);
vtx.source_position = atlas_position + Point(0.5, 0.5);
vtx.source_glyph_size = atlas_glyph_size - Point(1.0, 1.0);
vtx.source_position = atlas_position;
vtx.source_glyph_size = atlas_glyph_size;
if constexpr (std::is_same_v<TPipeline, GlyphAtlasPipeline>) {
vtx.has_color =
glyph_position.glyph.type == Glyph::Type::kBitmap ? 1.0 : 0.0;
Expand Down
7 changes: 4 additions & 3 deletions impeller/entity/shaders/glyph_atlas.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ out vec4 frag_color;

void main() {
vec2 uv_size = v_source_glyph_size / frag_info.atlas_size;
vec2 offset = v_source_position / frag_info.atlas_size;
vec2 uv_position = v_source_position / frag_info.atlas_size;
if (v_has_color == 1.0) {
frag_color =
texture(glyph_atlas_sampler, v_unit_position * uv_size + offset);
texture(glyph_atlas_sampler, v_unit_position * uv_size + uv_position);
} else {
frag_color =
texture(glyph_atlas_sampler, v_unit_position * uv_size + offset).aaaa *
texture(glyph_atlas_sampler, v_unit_position * uv_size + uv_position)
.aaaa *
frag_info.text_color;
}
}
3 changes: 2 additions & 1 deletion impeller/entity/shaders/glyph_atlas.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ void main() {
gl_Position = IPPositionForGlyphPosition(
frame_info.mvp, unit_position, destination_position, destination_size);
v_unit_position = unit_position;
v_source_position = source_position;
// Pixel snap the source (sampling) start position.
v_source_position = round(source_position);
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be floor instead of round?

Eh, nevermind.

v_source_glyph_size = source_glyph_size;
v_has_color = has_color;
}