Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
4 changes: 0 additions & 4 deletions ci/licenses_golden/licenses_flutter
Original file line number Diff line number Diff line change
Expand Up @@ -40911,8 +40911,6 @@ ORIGIN: ../../../flutter/impeller/toolkit/egl/surface.cc + ../../../flutter/LICE
ORIGIN: ../../../flutter/impeller/toolkit/egl/surface.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/toolkit/gles/gles.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/toolkit/gles/texture.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -43793,8 +43791,6 @@ FILE: ../../../flutter/impeller/toolkit/gles/gles.h
FILE: ../../../flutter/impeller/toolkit/gles/texture.cc
FILE: ../../../flutter/impeller/toolkit/gles/texture.h
FILE: ../../../flutter/impeller/tools/malioc.json
FILE: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.cc
FILE: ../../../flutter/impeller/typographer/backends/skia/glyph_atlas_context_skia.h
FILE: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.cc
FILE: ../../../flutter/impeller/typographer/backends/skia/text_frame_skia.h
FILE: ../../../flutter/impeller/typographer/backends/skia/typeface_skia.cc
Expand Down
2 changes: 1 addition & 1 deletion impeller/entity/contents/text_contents.cc
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ bool TextContents::Render(const ContentContext& renderer,
auto type = frame_->GetAtlasType();
const std::shared_ptr<GlyphAtlas>& atlas =
renderer.GetLazyGlyphAtlas()->CreateOrGetGlyphAtlas(
*renderer.GetContext(), type);
*renderer.GetContext(), renderer.GetTransientsBuffer(), type);

if (!atlas || !atlas->IsValid()) {
VALIDATION_LOG << "Cannot render glyphs without prepared atlas.";
Expand Down
7 changes: 4 additions & 3 deletions impeller/renderer/blit_pass.cc
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,12 @@ bool BlitPass::AddCopy(BufferView source,

auto bytes_per_pixel =
BytesPerPixelForPixelFormat(destination->GetTextureDescriptor().format);
auto bytes_per_image = destination_region_value.Area() * bytes_per_pixel;
auto bytes_per_region = destination_region_value.Area() * bytes_per_pixel;

if (source.range.length != bytes_per_image) {
if (source.range.length != bytes_per_region) {
VALIDATION_LOG
<< "Attempted to add a texture blit with out of bounds access.";
<< "Attempted to add a texture blit with out of bounds access."
<< source.range.length << " " << bytes_per_region;
return false;
}
if (slice > 5) {
Expand Down
2 changes: 0 additions & 2 deletions impeller/typographer/backends/skia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import("//flutter/impeller/tools/impeller.gni")

impeller_component("typographer_skia_backend") {
sources = [
"glyph_atlas_context_skia.cc",
"glyph_atlas_context_skia.h",
"text_frame_skia.cc",
"text_frame_skia.h",
"typeface_skia.cc",
Expand Down
23 changes: 0 additions & 23 deletions impeller/typographer/backends/skia/glyph_atlas_context_skia.cc

This file was deleted.

42 changes: 0 additions & 42 deletions impeller/typographer/backends/skia/glyph_atlas_context_skia.h

This file was deleted.

Loading