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

Manual Skia roll from 79a7b95e32fe to 0aec6f7bfbc8 #57134

Merged
auto-submit merged 11 commits into from
Dec 12, 2024
Merged

Manual Skia roll from 79a7b95e32fe to 0aec6f7bfbc8 #57134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
18805c2
[Impeller] remove std::vector usage in render pass vk.
Dec 11, 2024
72c36d5
reference.
Dec 11, 2024
fc61369
use .at().
Dec 11, 2024
fc7ebe7
Manual Skia roll from 79a7b95e32fe to 0aec6f7bfbc8
Dec 11, 2024
9e7166c
Update render_pass_builder_vk.cc
Dec 11, 2024
4ca71e9
Merge branch 'remove_std_vector' of github.com:jonahwilliams/engine i…
Dec 11, 2024
c83d2d9
Merge branch 'main' into unblock_roller
Dec 11, 2024
67c8df7
disable reactor unittest.
Dec 11, 2024
4e42a06
Merge branch 'unblock_roller' of github.com:jonahwilliams/engine into…
Dec 11, 2024
93963de
reverts
Dec 11, 2024
704bdd6
Merge branch 'main' into unblock_roller
Dec 12, 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
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vars = {
'flutter_git': 'https://flutter.googlesource.com',
'skia_git': 'https://skia.googlesource.com',
'llvm_git': 'https://llvm.googlesource.com',
'skia_revision': '79a7b95e32fe945a1424e596586d616b39cf023d',
'skia_revision': '0aec6f7bfbc84b47f9040afe1e534d70cd3145c3',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: e99672bef53628139c48a8b95d3e04de
Signature: 00978b4081cddc5274c012d30c40dd50

====================================================================================================
LIBRARY: etc1
Expand Down
8 changes: 4 additions & 4 deletions display_list/skia/dl_sk_conversions_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,12 @@ TEST(DisplayListSkConversions, ConvertWithZeroAndNegativeVerticesAndIndices) {
std::shared_ptr<DlVertices> vertices1 = DlVertices::Make(
DlVertexMode::kTriangles, 0, nullptr, nullptr, nullptr, 0, nullptr);
EXPECT_NE(vertices1, nullptr);
EXPECT_NE(ToSk(vertices1), nullptr);
EXPECT_EQ(ToSk(vertices1), nullptr);

std::shared_ptr<DlVertices> vertices2 = DlVertices::Make(
DlVertexMode::kTriangles, -1, nullptr, nullptr, nullptr, -1, nullptr);
EXPECT_NE(vertices2, nullptr);
EXPECT_NE(ToSk(vertices2), nullptr);
EXPECT_EQ(ToSk(vertices2), nullptr);
}

TEST(DisplayListVertices, ConvertWithZeroAndNegativeVerticesAndIndices) {
Expand All @@ -212,14 +212,14 @@ TEST(DisplayListVertices, ConvertWithZeroAndNegativeVerticesAndIndices) {
EXPECT_TRUE(builder1.is_valid());
std::shared_ptr<DlVertices> vertices1 = builder1.build();
EXPECT_NE(vertices1, nullptr);
EXPECT_NE(ToSk(vertices1), nullptr);
EXPECT_EQ(ToSk(vertices1), nullptr);

DlVertices::Builder builder2(DlVertexMode::kTriangles, -1,
DlVertices::Builder::kNone, -1);
EXPECT_TRUE(builder2.is_valid());
std::shared_ptr<DlVertices> vertices2 = builder2.build();
EXPECT_NE(vertices2, nullptr);
EXPECT_NE(ToSk(vertices2), nullptr);
EXPECT_EQ(ToSk(vertices2), nullptr);
}

TEST(DisplayListColorSource, ConvertRuntimeEffect) {
Expand Down
2 changes: 1 addition & 1 deletion impeller/renderer/backend/gles/test/reactor_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ TEST(ReactorGLES, UntrackedHandle) {
EXPECT_TRUE(reactor->React());
}

TEST(ReactorGLES, NameUntrackedHandle) {
TEST(ReactorGLES, DISABLED_NameUntrackedHandle) {
auto mock_gles_impl = std::make_unique<MockGLESImpl>();

EXPECT_CALL(*mock_gles_impl, GenTextures(1, _))
Expand Down
Loading