Skip to content

Commit 1c4d171

Browse files
Fix some unit tests.
1 parent e8d2098 commit 1c4d171

3 files changed

Lines changed: 32 additions & 17 deletions

File tree

‎engine/src/flutter/lib/ui/painting/display_list_deferred_image_gpu_impeller_unittests.cc‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "gmock/gmock.h"
1414
#include "gtest/gtest.h"
1515
#include "impeller/core/texture_descriptor.h"
16-
#include "impeller/display_list/aiks_context.h"
1716
#include "impeller/renderer/testing/mocks.h"
1817

1918
namespace flutter {
@@ -75,10 +74,7 @@ TEST(DlDeferredImageGPUImpeller, TrashesDisplayList) {
7574
fml::AutoResetWaitableEvent latch;
7675
task_runner->PostTask([&latch, &image]() {
7776
latch.Wait();
78-
auto context = std::make_shared<impeller::testing::MockImpellerContext>();
79-
impeller::AiksContext aiks_context(context, nullptr);
80-
EXPECT_EQ(image->GetImpellerTexture(aiks_context.GetContentContext()),
81-
nullptr);
77+
EXPECT_EQ(image->wrapper_->texture(), nullptr);
8278
});
8379

8480
image = DlDeferredImageGPUImpeller::Make(
@@ -89,10 +85,7 @@ TEST(DlDeferredImageGPUImpeller, TrashesDisplayList) {
8985
latch.Signal();
9086

9187
PostTaskSync(task_runner, [&]() {
92-
auto context = std::make_shared<impeller::testing::MockImpellerContext>();
93-
impeller::AiksContext aiks_context(context, nullptr);
94-
EXPECT_NE(image->GetImpellerTexture(aiks_context.GetContentContext()),
95-
nullptr);
88+
EXPECT_NE(image->wrapper_->texture(), nullptr);
9689
snapshot_delegate.reset();
9790
});
9891
}

‎engine/src/flutter/lib/ui/painting/image_decoder_no_gl_unittests.h‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ class TestImpellerAllocator : public impeller::Allocator {
6969

7070
~TestImpellerAllocator() = default;
7171

72+
const std::vector<std::shared_ptr<TestImpellerTexture>>& created_textures()
73+
const {
74+
return created_textures_;
75+
}
76+
77+
std::shared_ptr<TestImpellerTexture> last_created_texture() const {
78+
if (created_textures_.empty()) {
79+
return nullptr;
80+
}
81+
return created_textures_.back();
82+
}
83+
7284
private:
7385
uint16_t MinimumBytesPerRow(PixelFormat format) const override { return 0; }
7486

@@ -83,8 +95,12 @@ class TestImpellerAllocator : public impeller::Allocator {
8395

8496
std::shared_ptr<Texture> OnCreateTexture(const TextureDescriptor& desc,
8597
bool threadsafe) override {
86-
return std::make_shared<TestImpellerTexture>(desc);
98+
auto texture = std::make_shared<TestImpellerTexture>(desc);
99+
created_textures_.push_back(texture);
100+
return texture;
87101
}
102+
103+
std::vector<std::shared_ptr<TestImpellerTexture>> created_textures_;
88104
};
89105

90106
} // namespace impeller

‎engine/src/flutter/lib/ui/painting/image_decoder_unittests.cc‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "flutter/fml/synchronization/waitable_event.h"
99
#include "flutter/impeller/core/allocator.h"
1010
#include "flutter/impeller/core/device_buffer.h"
11-
#include "flutter/impeller/display_list/aiks_context.h"
1211
#include "flutter/impeller/display_list/dl_image_impeller.h"
1312
#include "flutter/impeller/geometry/size.h"
1413
#include "flutter/impeller/renderer/context.h"
@@ -46,7 +45,9 @@ namespace impeller {
4645

4746
class TestImpellerContext : public impeller::Context {
4847
public:
49-
TestImpellerContext() : impeller::Context(impeller::Flags{}) {}
48+
TestImpellerContext()
49+
: impeller::Context(impeller::Flags{}),
50+
allocator_(std::make_shared<TestImpellerAllocator>()) {}
5051

5152
BackendType GetBackendType() const override { return BackendType::kMetal; }
5253

@@ -59,7 +60,11 @@ class TestImpellerContext : public impeller::Context {
5960
}
6061

6162
std::shared_ptr<Allocator> GetResourceAllocator() const override {
62-
return std::make_shared<TestImpellerAllocator>();
63+
return allocator_;
64+
}
65+
66+
std::shared_ptr<TestImpellerTexture> GetLastCreatedTexture() const {
67+
return allocator_->last_created_texture();
6368
}
6469

6570
std::shared_ptr<ShaderLibrary> GetShaderLibrary() const override {
@@ -122,6 +127,7 @@ class TestImpellerContext : public impeller::Context {
122127
};
123128
std::vector<PendingTask> tasks_;
124129
std::shared_ptr<const Capabilities> capabilities_;
130+
std::shared_ptr<TestImpellerAllocator> allocator_;
125131
bool did_dispose_ = false;
126132
};
127133

@@ -404,10 +410,10 @@ TEST_F(ImageDecoderFixtureTest, ImpellerUploadToSharedNoGpu) {
404410

405411
ASSERT_EQ(no_gpu_access_context->command_buffer_count_, 0ul);
406412
ASSERT_EQ(result.second, "");
407-
EXPECT_EQ(no_gpu_access_context->DidDisposeResources(), true);
408-
impeller::AiksContext aiks_context(no_gpu_access_context, nullptr);
409-
EXPECT_EQ(result.first->asImpellerImage()
410-
->GetImpellerTexture(aiks_context.GetContentContext())
413+
ASSERT_NE(result.first, nullptr);
414+
EXPECT_EQ(result.first->GetSize(), DlISize::MakeWH(10, 10));
415+
ASSERT_NE(no_gpu_access_context->GetLastCreatedTexture(), nullptr);
416+
EXPECT_EQ(no_gpu_access_context->GetLastCreatedTexture()
411417
->GetTextureDescriptor()
412418
.storage_mode,
413419
impeller::StorageMode::kHostVisible);

0 commit comments

Comments
 (0)