DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reverts "Allow BufferViews to have non-owning references to DeviceBuffers (#56224)" (flutter/engine#56285)

Browse Source 
Reverts: flutter/engine#56224
Initiated by: jonahwilliams
Reason for reverting: merge issue.
Original PR Author: gaaclarke

Reviewed By: {jonahwilliams}

This change reverts the following previous change:
issue: https://github.com/flutter/flutter/issues/157538

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
This commit is contained in:
auto-submit[bot] 2024-10-31 22:48:46 +00:00 committed by GitHub
parent e1c05b7dd8
commit 528967bfae
40 changed files with 190 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/src/flutter/ci/licenses_golden/excluded_files
View File

@ -136,7 +136,6 @@
../../../flutter/impeller/compiler/shader_bundle_unittests.cc
../../../flutter/impeller/compiler/switches_unittests.cc
../../../flutter/impeller/core/allocator_unittests.cc
../../../flutter/impeller/core/buffer_view_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_atlas_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_basic_unittests.cc
../../../flutter/impeller/display_list/aiks_dl_blend_unittests.cc

2
engine/src/flutter/ci/licenses_golden/licenses_flutter
View File

@ -42900,7 +42900,6 @@ ORIGIN: ../../../flutter/impeller/core/formats.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/formats.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/host_buffer.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/host_buffer.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/idle_waiter.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/platform.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/platform.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/range.cc + ../../../flutter/LICENSE
@ -45762,7 +45761,6 @@ FILE: ../../../flutter/impeller/core/formats.cc
FILE: ../../../flutter/impeller/core/formats.h
FILE: ../../../flutter/impeller/core/host_buffer.cc
FILE: ../../../flutter/impeller/core/host_buffer.h
FILE: ../../../flutter/impeller/core/idle_waiter.h
FILE: ../../../flutter/impeller/core/platform.cc
FILE: ../../../flutter/impeller/core/platform.h
FILE: ../../../flutter/impeller/core/range.cc

6
engine/src/flutter/impeller/core/BUILD.gn
View File

@ -18,7 +18,6 @@ impeller_component("core") {
"formats.h",
"host_buffer.cc",
"host_buffer.h",
"idle_waiter.h",
"platform.cc",
"platform.h",
"range.cc",
@ -51,10 +50,7 @@ impeller_component("core") {
impeller_component("allocator_unittests") {
testonly = true
sources = [
"allocator_unittests.cc",
"buffer_view_unittests.cc",
]
sources = [ "allocator_unittests.cc" ]
deps = [
":core",

1
engine/src/flutter/impeller/core/allocator.h
View File

@ -8,7 +8,6 @@
#include "flutter/fml/mapping.h"
#include "impeller/base/allocation_size.h"
#include "impeller/core/device_buffer_descriptor.h"
#include "impeller/core/idle_waiter.h"
#include "impeller/core/texture.h"
#include "impeller/core/texture_descriptor.h"
#include "impeller/geometry/size.h"

25
engine/src/flutter/impeller/core/buffer_view.cc
View File

@ -6,29 +6,6 @@
namespace impeller {
BufferView::BufferView() : buffer_(nullptr), raw_buffer_(nullptr), range_({}) {}
BufferView::BufferView(DeviceBuffer* buffer, Range range)
: buffer_(), raw_buffer_(buffer), range_(range) {}
BufferView::BufferView(std::shared_ptr<const DeviceBuffer> buffer, Range range)
: buffer_(std::move(buffer)), raw_buffer_(nullptr), range_(range) {}
const DeviceBuffer* BufferView::GetBuffer() const {
return raw_buffer_ ? raw_buffer_ : buffer_.get();
}
std::shared_ptr<const DeviceBuffer> BufferView::TakeBuffer() {
if (buffer_) {
raw_buffer_ = buffer_.get();
return std::move(buffer_);
} else {
return nullptr;
}
}
BufferView::operator bool() const {
return buffer_ || raw_buffer_;
}
//
} // namespace impeller

29
engine/src/flutter/impeller/core/buffer_view.h
View File

@ -12,34 +12,11 @@ namespace impeller {
class DeviceBuffer;
/// A specific range in a DeviceBuffer.
///
/// BufferView can maintain ownership over the DeviceBuffer or not depending on
/// if it is created with a std::shared_ptr or a raw pointer.
struct BufferView {
public:
BufferView();
std::shared_ptr<const DeviceBuffer> buffer;
Range range;
BufferView(DeviceBuffer* buffer, Range range);
BufferView(std::shared_ptr<const DeviceBuffer> buffer, Range range);
Range GetRange() const { return range_; }
const DeviceBuffer* GetBuffer() const;
std::shared_ptr<const DeviceBuffer> TakeBuffer();
explicit operator bool() const;
private:
std::shared_ptr<const DeviceBuffer> buffer_;
/// This is a non-owned DeviceBuffer. Steps should be taken to make sure this
/// lives for the duration of the BufferView's life. Usually this is done
/// automatically by the graphics API or in the case of Vulkan the HostBuffer
/// or TrackedObjectsVK keeps it alive.
const DeviceBuffer* raw_buffer_;
Range range_;
constexpr explicit operator bool() const { return static_cast<bool>(buffer); }
};
} // namespace impeller

26
engine/src/flutter/impeller/core/buffer_view_unittests.cc
View File

@ -1,26 +0,0 @@
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "flutter/testing/testing.h"
#include "impeller/core/buffer_view.h"
namespace impeller {
namespace testing {
TEST(BufferViewTest, Empty) {
BufferView buffer_view;
EXPECT_FALSE(buffer_view);
}
TEST(BufferViewTest, TakeRaw) {
DeviceBuffer* buffer = reinterpret_cast<DeviceBuffer*>(0xcafebabe);
BufferView buffer_view(buffer, {0, 123});
EXPECT_TRUE(buffer_view);
std::shared_ptr<const DeviceBuffer> taken = buffer_view.TakeBuffer();
EXPECT_FALSE(taken);
EXPECT_EQ(buffer_view.GetBuffer(), buffer);
}
} // namespace testing
} // namespace impeller

6
engine/src/flutter/impeller/core/device_buffer.cc
View File

@ -16,8 +16,10 @@ void DeviceBuffer::Invalidate(std::optional<Range> range) const {}
// static
BufferView DeviceBuffer::AsBufferView(std::shared_ptr<DeviceBuffer> buffer) {
Range range = {0u, buffer->desc_.size};
return BufferView(std::move(buffer), range);
BufferView view;
view.buffer = std::move(buffer);
view.range = {0u, view.buffer->desc_.size};
return view;
}
const DeviceBufferDescriptor& DeviceBuffer::GetDeviceBufferDescriptor() const {

72
engine/src/flutter/impeller/core/host_buffer.cc
View File

@ -19,14 +19,12 @@ namespace impeller {
constexpr size_t kAllocatorBlockSize = 1024000; // 1024 Kb.
std::shared_ptr<HostBuffer> HostBuffer::Create(
const std::shared_ptr<Allocator>& allocator,
const std::shared_ptr<const IdleWaiter>& idle_waiter) {
return std::shared_ptr<HostBuffer>(new HostBuffer(allocator, idle_waiter));
const std::shared_ptr<Allocator>& allocator) {
return std::shared_ptr<HostBuffer>(new HostBuffer(allocator));
}
HostBuffer::HostBuffer(const std::shared_ptr<Allocator>& allocator,
const std::shared_ptr<const IdleWaiter>& idle_waiter)
: allocator_(allocator), idle_waiter_(idle_waiter) {
HostBuffer::HostBuffer(const std::shared_ptr<Allocator>& allocator)
: allocator_(allocator) {
DeviceBufferDescriptor desc;
desc.size = kAllocatorBlockSize;
desc.storage_mode = StorageMode::kHostVisible;
@ -37,52 +35,34 @@ HostBuffer::HostBuffer(const std::shared_ptr<Allocator>& allocator,
}
}
HostBuffer::~HostBuffer() {
if (idle_waiter_) {
// Since we hold on to DeviceBuffers we should make sure they aren't being
// used while we are deleting the HostBuffer.
idle_waiter_->WaitIdle();
}
};
HostBuffer::~HostBuffer() = default;
BufferView HostBuffer::Emplace(const void* buffer,
size_t length,
size_t align) {
auto [range, device_buffer, raw_device_buffer] =
EmplaceInternal(buffer, length, align);
if (device_buffer) {
return BufferView(std::move(device_buffer), range);
} else if (raw_device_buffer) {
return BufferView(raw_device_buffer, range);
} else {
auto [range, device_buffer] = EmplaceInternal(buffer, length, align);
if (!device_buffer) {
return {};
}
return BufferView{std::move(device_buffer), range};
}
BufferView HostBuffer::Emplace(const void* buffer, size_t length) {
auto [range, device_buffer, raw_device_buffer] =
EmplaceInternal(buffer, length);
if (device_buffer) {
return BufferView(std::move(device_buffer), range);
} else if (raw_device_buffer) {
return BufferView(raw_device_buffer, range);
} else {
auto [range, device_buffer] = EmplaceInternal(buffer, length);
if (!device_buffer) {
return {};
}
return BufferView{std::move(device_buffer), range};
}
BufferView HostBuffer::Emplace(size_t length,
size_t align,
const EmplaceProc& cb) {
auto [range, device_buffer, raw_device_buffer] =
EmplaceInternal(length, align, cb);
if (device_buffer) {
return BufferView(std::move(device_buffer), range);
} else if (raw_device_buffer) {
return BufferView(raw_device_buffer, range);
} else {
auto [range, device_buffer] = EmplaceInternal(length, align, cb);
if (!device_buffer) {
return {};
}
return BufferView{std::move(device_buffer), range};
}
HostBuffer::TestStateQuery HostBuffer::GetStateForTest() {
@ -110,10 +90,10 @@ bool HostBuffer::MaybeCreateNewBuffer() {
return true;
}
std::tuple<Range, std::shared_ptr<DeviceBuffer>, DeviceBuffer*>
HostBuffer::EmplaceInternal(size_t length,
size_t align,
const EmplaceProc& cb) {
std::tuple<Range, std::shared_ptr<DeviceBuffer>> HostBuffer::EmplaceInternal(
size_t length,
size_t align,
const EmplaceProc& cb) {
if (!cb) {
return {};
}
@ -133,7 +113,7 @@ HostBuffer::EmplaceInternal(size_t length,
cb(device_buffer->OnGetContents());
device_buffer->Flush(Range{0, length});
}
return std::make_tuple(Range{0, length}, std::move(device_buffer), nullptr);
return std::make_tuple(Range{0, length}, std::move(device_buffer));
}
size_t padding = 0;
@ -155,11 +135,12 @@ HostBuffer::EmplaceInternal(size_t length,
current_buffer->Flush(output_range);
offset_ += length;
return std::make_tuple(output_range, nullptr, current_buffer.get());
return std::make_tuple(output_range, current_buffer);
}
std::tuple<Range, std::shared_ptr<DeviceBuffer>, DeviceBuffer*>
HostBuffer::EmplaceInternal(const void* buffer, size_t length) {
std::tuple<Range, std::shared_ptr<DeviceBuffer>> HostBuffer::EmplaceInternal(
const void* buffer,
size_t length) {
// If the requested allocation is bigger than the block size, create a one-off
// device buffer and write to that.
if (length > kAllocatorBlockSize) {
@ -177,7 +158,7 @@ HostBuffer::EmplaceInternal(const void* buffer, size_t length) {
return {};
}
}
return std::make_tuple(Range{0, length}, std::move(device_buffer), nullptr);
return std::make_tuple(Range{0, length}, std::move(device_buffer));
}
auto old_length = GetLength();
@ -195,11 +176,10 @@ HostBuffer::EmplaceInternal(const void* buffer, size_t length) {
current_buffer->Flush(Range{old_length, length});
}
offset_ += length;
return std::make_tuple(Range{old_length, length}, nullptr,
current_buffer.get());
return std::make_tuple(Range{old_length, length}, current_buffer);
}
std::tuple<Range, std::shared_ptr<DeviceBuffer>, DeviceBuffer*>
std::tuple<Range, std::shared_ptr<DeviceBuffer>>
HostBuffer::EmplaceInternal(const void* buffer, size_t length, size_t align) {
if (align == 0 || (GetLength() % align) == 0) {
return EmplaceInternal(buffer, length);

13
engine/src/flutter/impeller/core/host_buffer.h
View File

@ -28,8 +28,7 @@ static const constexpr size_t kHostBufferArenaSize = 4u;
class HostBuffer {
public:
static std::shared_ptr<HostBuffer> Create(
const std::shared_ptr<Allocator>& allocator,
const std::shared_ptr<const IdleWaiter>& idle_waiter);
const std::shared_ptr<Allocator>& allocator);
~HostBuffer();
@ -134,13 +133,13 @@ class HostBuffer {
TestStateQuery GetStateForTest();
private:
[[nodiscard]] std::tuple<Range, std::shared_ptr<DeviceBuffer>, DeviceBuffer*>
[[nodiscard]] std::tuple<Range, std::shared_ptr<DeviceBuffer>>
EmplaceInternal(const void* buffer, size_t length);
std::tuple<Range, std::shared_ptr<DeviceBuffer>, DeviceBuffer*>
std::tuple<Range, std::shared_ptr<DeviceBuffer>>
EmplaceInternal(size_t length, size_t align, const EmplaceProc& cb);
std::tuple<Range, std::shared_ptr<DeviceBuffer>, DeviceBuffer*>
std::tuple<Range, std::shared_ptr<DeviceBuffer>>
EmplaceInternal(const void* buffer, size_t length, size_t align);
size_t GetLength() const { return offset_; }
@ -155,15 +154,13 @@ class HostBuffer {
[[nodiscard]] BufferView Emplace(const void* buffer, size_t length);
explicit HostBuffer(const std::shared_ptr<Allocator>& allocator,
const std::shared_ptr<const IdleWaiter>& idle_waiter);
explicit HostBuffer(const std::shared_ptr<Allocator>& allocator);
HostBuffer(const HostBuffer&) = delete;
HostBuffer& operator=(const HostBuffer&) = delete;
std::shared_ptr<Allocator> allocator_;
std::shared_ptr<const IdleWaiter> idle_waiter_;
std::array<std::vector<std::shared_ptr<DeviceBuffer>>, kHostBufferArenaSize>
device_buffers_;
size_t current_buffer_ = 0u;

25
engine/src/flutter/impeller/core/idle_waiter.h
View File

@ -1,25 +0,0 @@
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef FLUTTER_IMPELLER_CORE_IDLE_WAITER_H_
#define FLUTTER_IMPELLER_CORE_IDLE_WAITER_H_
namespace impeller {
/// Abstraction over waiting for the GPU to be idle.
///
/// This is important for platforms like Vulkan where we need to make sure
/// we aren't deleting resources while the GPU is using them.
class IdleWaiter {
public:
virtual ~IdleWaiter() = default;
/// Wait for the GPU tasks to finish.
/// This is a noop on some platforms, it's important for Vulkan.
virtual void WaitIdle() const = 0;
};
} // namespace impeller
#endif // FLUTTER_IMPELLER_CORE_IDLE_WAITER_H_

3
engine/src/flutter/impeller/entity/contents/content_context.cc
View File

@ -250,8 +250,7 @@ ContentContext::ContentContext(
? std::make_shared<RenderTargetCache>(
context_->GetResourceAllocator())
: std::move(render_target_allocator)),
host_buffer_(HostBuffer::Create(context_->GetResourceAllocator(),
context_->GetIdleWaiter())) {
host_buffer_(HostBuffer::Create(context_->GetResourceAllocator())) {
if (!context_ || !context_->IsValid()) {
return;
}

4
engine/src/flutter/impeller/entity/contents/filters/blend_filter_contents_unittests.cc
View File

@ -54,8 +54,8 @@ TEST_P(BlendFilterContentsTest, AdvancedBlendColorAlignsColorTo4) {
uint8_t byte = 0xff;
BufferView buffer_view =
renderer->GetTransientsBuffer().Emplace(&byte, /*length=*/1, /*align=*/1);
EXPECT_EQ(buffer_view.GetRange().offset, 4u);
EXPECT_EQ(buffer_view.GetRange().length, 1u);
EXPECT_EQ(buffer_view.range.offset, 4u);
EXPECT_EQ(buffer_view.range.length, 1u);
Entity entity;
std::optional<Entity> result = filter_contents.GetEntity(

67
engine/src/flutter/impeller/entity/contents/host_buffer_unittests.cc
View File

@ -4,48 +4,30 @@
#include <limits>
#include <utility>
#include "flutter/testing/testing.h"
#include "gmock/gmock.h"
#include "impeller/base/validation.h"
#include "impeller/core/allocator.h"
#include "impeller/core/host_buffer.h"
#include "impeller/core/idle_waiter.h"
#include "impeller/entity/entity_playground.h"
namespace impeller {
namespace testing {
class MockIdleWaiter : public IdleWaiter {
public:
MOCK_METHOD(void, WaitIdle, (), (const, override));
};
using HostBufferTest = EntityPlayground;
INSTANTIATE_PLAYGROUND_SUITE(HostBufferTest);
TEST_P(HostBufferTest, IdleWaiter) {
auto mock_idle_waiter = std::make_shared<MockIdleWaiter>();
{
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
mock_idle_waiter);
EXPECT_CALL(*mock_idle_waiter, WaitIdle());
}
}
TEST_P(HostBufferTest, CanEmplace) {
struct Length2 {
uint8_t pad[2];
};
static_assert(sizeof(Length2) == 2u);
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
for (size_t i = 0; i < 12500; i++) {
auto view = buffer->Emplace(Length2{});
ASSERT_TRUE(view);
ASSERT_EQ(view.GetRange(), Range(i * sizeof(Length2), 2u));
ASSERT_EQ(view.range, Range(i * sizeof(Length2), 2u));
}
}
@ -60,39 +42,37 @@ TEST_P(HostBufferTest, CanEmplaceWithAlignment) {
static_assert(alignof(Align16) == 16);
static_assert(sizeof(Align16) == 16);
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
ASSERT_TRUE(buffer);
{
auto view = buffer->Emplace(Length2{});
ASSERT_TRUE(view);
ASSERT_EQ(view.GetRange(), Range(0u, 2u));
ASSERT_EQ(view.range, Range(0u, 2u));
}
{
auto view = buffer->Emplace(Align16{});
ASSERT_TRUE(view);
ASSERT_EQ(view.GetRange().offset, 16u);
ASSERT_EQ(view.GetRange().length, 16u);
ASSERT_EQ(view.range.offset, 16u);
ASSERT_EQ(view.range.length, 16u);
}
{
auto view = buffer->Emplace(Length2{});
ASSERT_TRUE(view);
ASSERT_EQ(view.GetRange(), Range(32u, 2u));
ASSERT_EQ(view.range, Range(32u, 2u));
}
{
auto view = buffer->Emplace(Align16{});
ASSERT_TRUE(view);
ASSERT_EQ(view.GetRange().offset, 48u);
ASSERT_EQ(view.GetRange().length, 16u);
ASSERT_EQ(view.range.offset, 48u);
ASSERT_EQ(view.range.length, 16u);
}
}
TEST_P(HostBufferTest, HostBufferInitialState) {
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
EXPECT_EQ(buffer->GetStateForTest().current_buffer, 0u);
EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
@ -100,8 +80,7 @@ TEST_P(HostBufferTest, HostBufferInitialState) {
}
TEST_P(HostBufferTest, ResetIncrementsFrameCounter) {
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
EXPECT_EQ(buffer->GetStateForTest().current_frame, 0u);
@ -120,8 +99,7 @@ TEST_P(HostBufferTest, ResetIncrementsFrameCounter) {
TEST_P(HostBufferTest,
EmplacingLargerThanBlockSizeCreatesOneOffBufferCallback) {
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
// Emplace an amount larger than the block size, to verify that the host
// buffer does not create a buffer.
@ -133,8 +111,7 @@ TEST_P(HostBufferTest,
}
TEST_P(HostBufferTest, EmplacingLargerThanBlockSizeCreatesOneOffBuffer) {
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
// Emplace an amount larger than the block size, to verify that the host
// buffer does not create a buffer.
@ -146,8 +123,7 @@ TEST_P(HostBufferTest, EmplacingLargerThanBlockSizeCreatesOneOffBuffer) {
}
TEST_P(HostBufferTest, UnusedBuffersAreDiscardedWhenResetting) {
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
// Emplace two large allocations to force the allocation of a second buffer.
auto buffer_view_a = buffer->Emplace(1020000, 0, [](uint8_t* data) {});
@ -178,14 +154,13 @@ TEST_P(HostBufferTest, UnusedBuffersAreDiscardedWhenResetting) {
}
TEST_P(HostBufferTest, EmplaceWithProcIsAligned) {
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
BufferView view = buffer->Emplace(std::array<char, 21>());
EXPECT_EQ(view.GetRange(), Range(0, 21));
EXPECT_EQ(view.range, Range(0, 21));
view = buffer->Emplace(64, 16, [](uint8_t*) {});
EXPECT_EQ(view.GetRange(), Range(32, 64));
EXPECT_EQ(view.range, Range(32, 64));
}
static constexpr const size_t kMagicFailingAllocation = 1024000 * 2;
@ -222,13 +197,13 @@ TEST_P(HostBufferTest, EmplaceWithFailingAllocationDoesntCrash) {
ScopedValidationDisable disable;
std::shared_ptr<FailingAllocator> allocator =
std::make_shared<FailingAllocator>(GetContext()->GetResourceAllocator());
auto buffer = HostBuffer::Create(allocator, GetContext()->GetIdleWaiter());
auto buffer = HostBuffer::Create(allocator);
auto view = buffer->Emplace(nullptr, kMagicFailingAllocation, 0);
EXPECT_EQ(view.GetBuffer(), nullptr);
EXPECT_EQ(view.GetRange().offset, 0u);
EXPECT_EQ(view.GetRange().length, 0u);
EXPECT_EQ(view.buffer, nullptr);
EXPECT_EQ(view.range.offset, 0u);
EXPECT_EQ(view.range.length, 0u);
}
} // namespace testing

5
engine/src/flutter/impeller/entity/entity_unittests.cc
View File

@ -1863,9 +1863,8 @@ TEST_P(EntityTest, RuntimeEffectSetsRightSizeWhenUniformIsStruct) {
// 8 bytes for iResolution
// 4 bytes for iTime
// 4 bytes padding
EXPECT_EQ(
command.fragment_bindings.buffers[0].view.resource.GetRange().length,
16u);
EXPECT_EQ(command.fragment_bindings.buffers[0].view.resource.range.length,
16u);
}
TEST_P(EntityTest, ColorFilterWithForegroundColorAdvancedBlend) {

17
engine/src/flutter/impeller/playground/imgui/imgui_impl_impeller.cc
View File

@ -143,8 +143,7 @@ void ImGui_ImplImpeller_RenderDrawData(ImDrawData* draw_data,
return; // Nothing to render.
}
auto host_buffer = impeller::HostBuffer::Create(
render_pass.GetContext()->GetResourceAllocator(),
render_pass.GetContext()->GetIdleWaiter());
render_pass.GetContext()->GetResourceAllocator());
using VS = impeller::ImguiRasterVertexShader;
using FS = impeller::ImguiRasterFragmentShader;
@ -266,12 +265,14 @@ void ImGui_ImplImpeller_RenderDrawData(ImDrawData* draw_data,
vertex_buffer_offset + pcmd->VtxOffset * sizeof(ImDrawVert);
impeller::VertexBuffer vertex_buffer;
vertex_buffer.vertex_buffer = impeller::BufferView(
buffer, impeller::Range(vb_start, draw_list_vtx_bytes - vb_start));
vertex_buffer.index_buffer = impeller::BufferView(
buffer, impeller::Range(index_buffer_offset +
pcmd->IdxOffset * sizeof(ImDrawIdx),
pcmd->ElemCount * sizeof(ImDrawIdx)));
vertex_buffer.vertex_buffer = impeller::BufferView{
.buffer = buffer,
.range = impeller::Range(vb_start, draw_list_vtx_bytes - vb_start)};
vertex_buffer.index_buffer = {
.buffer = buffer,
.range = impeller::Range(
index_buffer_offset + pcmd->IdxOffset * sizeof(ImDrawIdx),
pcmd->ElemCount * sizeof(ImDrawIdx))};
vertex_buffer.vertex_count = pcmd->ElemCount;
vertex_buffer.index_type = impeller::IndexType::k16bit;
render_pass.SetVertexBuffer(std::move(vertex_buffer));

6
engine/src/flutter/impeller/renderer/backend/gles/blit_command_gles.cc
View File

@ -220,7 +220,7 @@ bool BlitCopyBufferToTextureCommandGLES::Encode(
}
if (!tex_descriptor.IsValid() ||
source.GetRange().length !=
source.range.length !=
BytesPerPixelForPixelFormat(tex_descriptor.format) *
destination_region.Area()) {
return false;
@ -263,8 +263,8 @@ bool BlitCopyBufferToTextureCommandGLES::Encode(
}
const auto& gl = reactor.GetProcTable();
gl.BindTexture(texture_type, gl_handle.value());
const GLvoid* tex_data = data.buffer_view.GetBuffer()->OnGetContents() +
data.buffer_view.GetRange().offset;
const GLvoid* tex_data =
data.buffer_view.buffer->OnGetContents() + data.buffer_view.range.offset;
// GL_INVALID_OPERATION if the texture array has not been
// defined by a previous glTexImage2D operation.

4
engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.cc
View File

@ -276,14 +276,14 @@ bool BufferBindingsGLES::BindUniformBuffer(const ProcTableGLES& gl,
Allocator& transients_allocator,
const BufferResource& buffer) {
const auto* metadata = buffer.GetMetadata();
auto device_buffer = buffer.resource.GetBuffer();
auto device_buffer = buffer.resource.buffer;
if (!device_buffer) {
VALIDATION_LOG << "Device buffer not found.";
return false;
}
const auto& device_buffer_gles = DeviceBufferGLES::Cast(*device_buffer);
const uint8_t* buffer_ptr =
device_buffer_gles.GetBufferData() + buffer.resource.GetRange().offset;
device_buffer_gles.GetBufferData() + buffer.resource.range.offset;
if (metadata->members.empty()) {
VALIDATION_LOG << "Uniform buffer had no members. This is currently "

8
engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc
View File

@ -149,7 +149,7 @@ static bool BindVertexBuffer(const ProcTableGLES& gl,
return false;
}
const DeviceBuffer* vertex_buffer = vertex_buffer_view.GetBuffer();
auto vertex_buffer = vertex_buffer_view.buffer;
if (!vertex_buffer) {
return false;
@ -165,7 +165,7 @@ static bool BindVertexBuffer(const ProcTableGLES& gl,
/// Bind the vertex attributes associated with vertex buffer.
///
if (!vertex_desc_gles->BindVertexAttributes(
gl, buffer_index, vertex_buffer_view.GetRange().offset)) {
gl, buffer_index, vertex_buffer_view.range.offset)) {
return false;
}
@ -459,7 +459,7 @@ static bool BindVertexBuffer(const ProcTableGLES& gl,
} else {
// Bind the index buffer if necessary.
auto index_buffer_view = command.index_buffer;
const DeviceBuffer* index_buffer = index_buffer_view.GetBuffer();
auto index_buffer = index_buffer_view.buffer;
const auto& index_buffer_gles = DeviceBufferGLES::Cast(*index_buffer);
if (!index_buffer_gles.BindAndUploadDataIfNecessary(
DeviceBufferGLES::BindingType::kElementArrayBuffer)) {
@ -469,7 +469,7 @@ static bool BindVertexBuffer(const ProcTableGLES& gl,
command.element_count, // count
ToIndexType(command.index_type), // type
reinterpret_cast<const GLvoid*>(static_cast<GLsizei>(
index_buffer_view.GetRange().offset)) // indices
index_buffer_view.range.offset)) // indices
);
}

4
engine/src/flutter/impeller/renderer/backend/metal/blit_pass_mtl.mm
View File

@ -194,7 +194,7 @@ bool BlitPassMTL::OnCopyBufferToTextureCommand(
uint32_t mip_level,
uint32_t slice,
bool convert_to_read) {
auto source_mtl = DeviceBufferMTL::Cast(*source.GetBuffer()).GetMTLBuffer();
auto source_mtl = DeviceBufferMTL::Cast(*source.buffer).GetMTLBuffer();
if (!source_mtl) {
return false;
}
@ -221,7 +221,7 @@ bool BlitPassMTL::OnCopyBufferToTextureCommand(
#endif // IMPELLER_DEBUG
[encoder_
copyFromBuffer:source_mtl
sourceOffset:source.GetRange().offset
sourceOffset:source.range.offset
sourceBytesPerRow:source_bytes_per_row
sourceBytesPerImage:
0 // 0 for 2D textures according to

7
engine/src/flutter/impeller/renderer/backend/metal/compute_pass_mtl.mm
View File

@ -84,11 +84,11 @@ bool ComputePassMTL::BindResource(ShaderStage stage,
const ShaderUniformSlot& slot,
const ShaderMetadata& metadata,
BufferView view) {
if (!view.GetBuffer()) {
if (!view.buffer) {
return false;
}
const DeviceBuffer* device_buffer = view.GetBuffer();
const std::shared_ptr<const DeviceBuffer>& device_buffer = view.buffer;
if (!device_buffer) {
return false;
}
@ -99,8 +99,7 @@ bool ComputePassMTL::BindResource(ShaderStage stage,
return false;
}
pass_bindings_cache_.SetBuffer(slot.ext_res_0, view.GetRange().offset,
buffer);
pass_bindings_cache_.SetBuffer(slot.ext_res_0, view.range.offset, buffer);
return true;
}

12
engine/src/flutter/impeller/renderer/backend/metal/render_pass_mtl.mm
View File

@ -189,11 +189,11 @@ static bool Bind(PassBindingsCacheMTL& pass,
ShaderStage stage,
size_t bind_index,
const BufferView& view) {
if (!view.GetBuffer()) {
if (!view.buffer) {
return false;
}
const DeviceBuffer* device_buffer = view.GetBuffer();
auto device_buffer = view.buffer;
if (!device_buffer) {
return false;
}
@ -204,7 +204,7 @@ static bool Bind(PassBindingsCacheMTL& pass,
return false;
}
return pass.SetBuffer(stage, bind_index, view.GetRange().offset, buffer);
return pass.SetBuffer(stage, bind_index, view.range.offset, buffer);
}
static bool Bind(PassBindingsCacheMTL& pass,
@ -346,13 +346,13 @@ fml::Status RenderPassMTL::Draw() {
}
} else {
id<MTLBuffer> mtl_index_buffer =
DeviceBufferMTL::Cast(*index_buffer_.GetBuffer()).GetMTLBuffer();
DeviceBufferMTL::Cast(*index_buffer_.buffer).GetMTLBuffer();
if (instance_count_ != 1u) {
[encoder_ drawIndexedPrimitives:ToMTLPrimitiveType(primitive_type_)
indexCount:vertex_count_
indexType:index_type_
indexBuffer:mtl_index_buffer
indexBufferOffset:index_buffer_.GetRange().offset
indexBufferOffset:index_buffer_.range.offset
instanceCount:instance_count_
baseVertex:base_vertex_
baseInstance:0u];
@ -361,7 +361,7 @@ fml::Status RenderPassMTL::Draw() {
indexCount:vertex_count_
indexType:index_type_
indexBuffer:mtl_index_buffer
indexBufferOffset:index_buffer_.GetRange().offset];
indexBufferOffset:index_buffer_.range.offset];
}
}

7
engine/src/flutter/impeller/renderer/backend/vulkan/blit_pass_vk.cc
View File

@ -248,10 +248,9 @@ bool BlitPassVK::OnCopyBufferToTextureCommand(
// cast destination to TextureVK
const auto& dst = TextureVK::Cast(*destination);
const auto& src = DeviceBufferVK::Cast(*source.GetBuffer());
const auto& src = DeviceBufferVK::Cast(*source.buffer);
std::shared_ptr<const DeviceBuffer> source_buffer = source.TakeBuffer();
if ((source_buffer && !command_buffer_->Track(source_buffer)) ||
if (!command_buffer_->Track(source.buffer) ||
!command_buffer_->Track(destination)) {
return false;
}
@ -267,7 +266,7 @@ bool BlitPassVK::OnCopyBufferToTextureCommand(
vk::PipelineStageFlagBits::eTransfer;
vk::BufferImageCopy image_copy;
image_copy.setBufferOffset(source.GetRange().offset);
image_copy.setBufferOffset(source.range.offset);
image_copy.setBufferRowLength(0);
image_copy.setBufferImageHeight(0);
image_copy.setImageSubresource(vk::ImageSubresourceLayers(

12
engine/src/flutter/impeller/renderer/backend/vulkan/compute_pass_vk.cc
View File

@ -178,27 +178,27 @@ bool ComputePassVK::BindResource(
bool ComputePassVK::BindResource(size_t binding,
DescriptorType type,
BufferView view) {
const BufferView& view) {
if (bound_buffer_offset_ >= kMaxBindings) {
return false;
}
auto buffer = DeviceBufferVK::Cast(*view.GetBuffer()).GetBuffer();
const std::shared_ptr<const DeviceBuffer>& device_buffer = view.buffer;
auto buffer = DeviceBufferVK::Cast(*device_buffer).GetBuffer();
if (!buffer) {
return false;
}
std::shared_ptr<const DeviceBuffer> device_buffer = view.TakeBuffer();
if (device_buffer && !command_buffer_->Track(device_buffer)) {
if (!command_buffer_->Track(device_buffer)) {
return false;
}
uint32_t offset = view.GetRange().offset;
uint32_t offset = view.range.offset;
vk::DescriptorBufferInfo buffer_info;
buffer_info.buffer = buffer;
buffer_info.offset = offset;
buffer_info.range = view.GetRange().length;
buffer_info.range = view.range.length;
buffer_workspace_[bound_buffer_offset_++] = buffer_info;
vk::WriteDescriptorSet write_set;

4
engine/src/flutter/impeller/renderer/backend/vulkan/compute_pass_vk.h
View File

@ -82,7 +82,9 @@ class ComputePassVK final : public ComputePass {
std::shared_ptr<const Texture> texture,
const std::unique_ptr<const Sampler>& sampler) override;
bool BindResource(size_t binding, DescriptorType type, BufferView view);
bool BindResource(size_t binding,
DescriptorType type,
const BufferView& view);
};
} // namespace impeller

1
engine/src/flutter/impeller/renderer/backend/vulkan/context_vk.cc
View File

@ -456,7 +456,6 @@ void ContextVK::Setup(Settings settings) {
/// All done!
///
device_holder_ = std::move(device_holder);
idle_waiter_vk_ = std::make_shared<IdleWaiterVK>(device_holder_);
driver_info_ =
std::make_unique<DriverInfoVK>(device_holder_->physical_device);
debug_report_ = std::move(debug_report);

23
engine/src/flutter/impeller/renderer/backend/vulkan/context_vk.h
View File

@ -41,24 +41,6 @@ class DescriptorPoolRecyclerVK;
class CommandQueueVK;
class DescriptorPoolVK;
class IdleWaiterVK : public IdleWaiter {
public:
explicit IdleWaiterVK(std::weak_ptr<DeviceHolderVK> device_holder)
: device_holder_(std::move(device_holder)) {}
void WaitIdle() const override {
std::shared_ptr<DeviceHolderVK> strong_device_holder_ =
device_holder_.lock();
if (strong_device_holder_ && strong_device_holder_->GetDevice()) {
[[maybe_unused]] auto result =
strong_device_holder_->GetDevice().waitIdle();
}
}
private:
std::weak_ptr<DeviceHolderVK> device_holder_;
};
class ContextVK final : public Context,
public BackendCast<ContextVK, Context>,
public std::enable_shared_from_this<ContextVK> {
@ -229,10 +211,6 @@ class ContextVK final : public Context,
// | Context |
bool FlushCommandBuffers() override;
std::shared_ptr<const IdleWaiter> GetIdleWaiter() const override {
return idle_waiter_vk_;
}
private:
struct DeviceHolderImpl : public DeviceHolderVK {
// |DeviceHolder|
@ -273,7 +251,6 @@ class ContextVK final : public Context,
std::shared_ptr<fml::ConcurrentMessageLoop> raster_message_loop_;
std::shared_ptr<GPUTracerVK> gpu_tracer_;
std::shared_ptr<CommandQueue> command_queue_vk_;
std::shared_ptr<const IdleWaiter> idle_waiter_vk_;
using DescriptorPoolMap =
std::unordered_map<std::thread::id, std::shared_ptr<DescriptorPoolVK>>;

37
engine/src/flutter/impeller/renderer/backend/vulkan/render_pass_vk.cc
View File

@ -377,14 +377,9 @@ bool RenderPassVK::SetVertexBuffer(BufferView vertex_buffers[],
vk::Buffer buffers[kMaxVertexBuffers];
vk::DeviceSize vertex_buffer_offsets[kMaxVertexBuffers];
for (size_t i = 0; i < vertex_buffer_count; i++) {
buffers[i] =
DeviceBufferVK::Cast(*vertex_buffers[i].GetBuffer()).GetBuffer();
vertex_buffer_offsets[i] = vertex_buffers[i].GetRange().offset;
std::shared_ptr<const DeviceBuffer> device_buffer =
vertex_buffers[i].TakeBuffer();
if (device_buffer) {
command_buffer_->Track(device_buffer);
}
buffers[i] = DeviceBufferVK::Cast(*vertex_buffers[i].buffer).GetBuffer();
vertex_buffer_offsets[i] = vertex_buffers[i].range.offset;
command_buffer_->Track(vertex_buffers[i].buffer);
}
// Bind the vertex buffers.
@ -404,27 +399,27 @@ bool RenderPassVK::SetIndexBuffer(BufferView index_buffer,
if (index_type != IndexType::kNone) {
has_index_buffer_ = true;
BufferView index_buffer_view = std::move(index_buffer);
const BufferView& index_buffer_view = index_buffer;
if (!index_buffer_view) {
return false;
}
if (!index_buffer_view.GetBuffer()) {
const std::shared_ptr<const DeviceBuffer>& index_buffer =
index_buffer_view.buffer;
if (!index_buffer) {
VALIDATION_LOG << "Failed to acquire device buffer"
<< " for index buffer view";
return false;
}
std::shared_ptr<const DeviceBuffer> index_buffer =
index_buffer_view.TakeBuffer();
if (index_buffer && !command_buffer_->Track(index_buffer)) {
if (!command_buffer_->Track(index_buffer)) {
return false;
}
vk::Buffer index_buffer_handle =
DeviceBufferVK::Cast(*index_buffer_view.GetBuffer()).GetBuffer();
DeviceBufferVK::Cast(*index_buffer).GetBuffer();
command_buffer_vk_.bindIndexBuffer(index_buffer_handle,
index_buffer_view.GetRange().offset,
index_buffer_view.range.offset,
ToVKIndexType(index_type));
} else {
has_index_buffer_ = false;
@ -560,27 +555,27 @@ bool RenderPassVK::BindResource(
bool RenderPassVK::BindResource(size_t binding,
DescriptorType type,
BufferView view) {
const BufferView& view) {
if (bound_buffer_offset_ >= kMaxBindings) {
return false;
}
auto buffer = DeviceBufferVK::Cast(*view.GetBuffer()).GetBuffer();
const std::shared_ptr<const DeviceBuffer>& device_buffer = view.buffer;
auto buffer = DeviceBufferVK::Cast(*device_buffer).GetBuffer();
if (!buffer) {
return false;
}
std::shared_ptr<const DeviceBuffer> device_buffer = view.TakeBuffer();
if (device_buffer && !command_buffer_->Track(device_buffer)) {
if (!command_buffer_->Track(device_buffer)) {
return false;
}
uint32_t offset = view.GetRange().offset;
uint32_t offset = view.range.offset;
vk::DescriptorBufferInfo buffer_info;
buffer_info.buffer = buffer;
buffer_info.offset = offset;
buffer_info.range = view.GetRange().length;
buffer_info.range = view.range.length;
buffer_workspace_[bound_buffer_offset_++] = buffer_info;
vk::WriteDescriptorSet write_set;

4
engine/src/flutter/impeller/renderer/backend/vulkan/render_pass_vk.h
View File

@ -117,7 +117,9 @@ class RenderPassVK final : public RenderPass {
std::shared_ptr<const Texture> texture,
const std::unique_ptr<const Sampler>& sampler) override;
bool BindResource(size_t binding, DescriptorType type, BufferView view);
bool BindResource(size_t binding,
DescriptorType type,
const BufferView& view);
// |RenderPass|
bool IsValid() const override;

4
engine/src/flutter/impeller/renderer/backend/vulkan/surface_context_vk.cc
View File

@ -58,10 +58,6 @@ const std::shared_ptr<const Capabilities>& SurfaceContextVK::GetCapabilities()
return parent_->GetCapabilities();
}
std::shared_ptr<const IdleWaiter> SurfaceContextVK::GetIdleWaiter() const {
return parent_->GetIdleWaiter();
}
void SurfaceContextVK::Shutdown() {
parent_->Shutdown();
}

2
engine/src/flutter/impeller/renderer/backend/vulkan/surface_context_vk.h
View File

@ -66,8 +66,6 @@ class SurfaceContextVK : public Context,
// |Context|
std::shared_ptr<CommandQueue> GetCommandQueue() const override;
std::shared_ptr<const IdleWaiter> GetIdleWaiter() const override;
// |Context|
void Shutdown() override;

2
engine/src/flutter/impeller/renderer/blit_pass.cc
View File

@ -146,7 +146,7 @@ bool BlitPass::AddCopy(BufferView source,
BytesPerPixelForPixelFormat(destination->GetTextureDescriptor().format);
auto bytes_per_region = destination_region_value.Area() * bytes_per_pixel;
if (source.GetRange().length != bytes_per_region) {
if (source.range.length != bytes_per_region) {
VALIDATION_LOG
<< "Attempted to add a texture blit with out of bounds access.";
return false;

26
engine/src/flutter/impeller/renderer/compute_unittests.cc
View File

@ -30,8 +30,7 @@ TEST_P(ComputeTest, CapabilitiesReportSupport) {
TEST_P(ComputeTest, CanCreateComputePass) {
using CS = SampleComputeShader;
auto context = GetContext();
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
ASSERT_TRUE(context);
ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
@ -85,7 +84,7 @@ TEST_P(ComputeTest, CanCreateComputePass) {
EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
auto view = DeviceBuffer::AsBufferView(output_buffer);
EXPECT_EQ(view.GetRange().length, sizeof(CS::Output<kCount>));
EXPECT_EQ(view.range.length, sizeof(CS::Output<kCount>));
CS::Output<kCount>* output =
reinterpret_cast<CS::Output<kCount>*>(
@ -110,8 +109,7 @@ TEST_P(ComputeTest, CanCreateComputePass) {
TEST_P(ComputeTest, CanComputePrefixSum) {
using CS = PrefixSumTestComputeShader;
auto context = GetContext();
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
ASSERT_TRUE(context);
ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
@ -154,7 +152,7 @@ TEST_P(ComputeTest, CanComputePrefixSum) {
EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
auto view = DeviceBuffer::AsBufferView(output_buffer);
EXPECT_EQ(view.GetRange().length,
EXPECT_EQ(view.range.length,
sizeof(CS::OutputData<kCount>));
CS::OutputData<kCount>* output =
@ -212,7 +210,7 @@ TEST_P(ComputeTest, 1DThreadgroupSizingIsCorrect) {
EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
auto view = DeviceBuffer::AsBufferView(output_buffer);
EXPECT_EQ(view.GetRange().length,
EXPECT_EQ(view.range.length,
sizeof(CS::OutputData<kCount>));
CS::OutputData<kCount>* output =
@ -231,8 +229,7 @@ TEST_P(ComputeTest, CanComputePrefixSumLargeInteractive) {
using CS = PrefixSumTestComputeShader;
auto context = GetContext();
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
ASSERT_TRUE(context);
ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
@ -278,8 +275,7 @@ TEST_P(ComputeTest, MultiStageInputAndOutput) {
using Stage2PipelineBuilder = ComputePipelineBuilder<CS2>;
auto context = GetContext();
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
ASSERT_TRUE(context);
ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
@ -377,8 +373,7 @@ TEST_P(ComputeTest, MultiStageInputAndOutput) {
TEST_P(ComputeTest, CanCompute1DimensionalData) {
using CS = SampleComputeShader;
auto context = GetContext();
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
ASSERT_TRUE(context);
ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());
@ -432,7 +427,7 @@ TEST_P(ComputeTest, CanCompute1DimensionalData) {
EXPECT_EQ(status, CommandBuffer::Status::kCompleted);
auto view = DeviceBuffer::AsBufferView(output_buffer);
EXPECT_EQ(view.GetRange().length, sizeof(CS::Output<kCount>));
EXPECT_EQ(view.range.length, sizeof(CS::Output<kCount>));
CS::Output<kCount>* output =
reinterpret_cast<CS::Output<kCount>*>(
@ -457,8 +452,7 @@ TEST_P(ComputeTest, CanCompute1DimensionalData) {
TEST_P(ComputeTest, ReturnsEarlyWhenAnyGridDimensionIsZero) {
using CS = SampleComputeShader;
auto context = GetContext();
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
ASSERT_TRUE(context);
ASSERT_TRUE(context->GetCapabilities()->SupportsCompute());

4
engine/src/flutter/impeller/renderer/context.h
View File

@ -222,10 +222,6 @@ class Context {
/// rendering a 2D workload.
[[nodiscard]] virtual bool FlushCommandBuffers();
virtual std::shared_ptr<const IdleWaiter> GetIdleWaiter() const {
return nullptr;
}
protected:
Context();

3
engine/src/flutter/impeller/renderer/renderer_dart_unittests.cc
View File

@ -224,8 +224,7 @@ class RendererDartTest : public PlaygroundTest,
return false;
}
auto buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto buffer = HostBuffer::Create(context->GetResourceAllocator());
pass.SetVertexBuffer(texture_vtx_builder.CreateVertexBuffer(
*context->GetResourceAllocator()));

68
engine/src/flutter/impeller/renderer/renderer_unittests.cc
View File

@ -80,8 +80,7 @@ TEST_P(RendererTest, CanCreateBoxPrimitive) {
context->GetSamplerLibrary()->GetSampler({});
ASSERT_TRUE(sampler);
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
SinglePassCallback callback = [&](RenderPass& pass) {
ImGui::Begin("Controls", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
static bool wireframe;
@ -146,8 +145,7 @@ TEST_P(RendererTest, BabysFirstTriangle) {
auto pipeline = context->GetPipelineLibrary()->GetPipeline(desc).Get();
// Create a host side buffer to build the vertex and uniform information.
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
// Specify the vertex buffer information.
VertexBufferBuilder<VS::PerVertexData> vertex_buffer_builder;
@ -167,8 +165,7 @@ TEST_P(RendererTest, BabysFirstTriangle) {
FS::FragInfo frag_info;
frag_info.time = fml::TimePoint::Now().ToEpochDelta().ToSecondsF();
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
FS::BindFragInfo(pass, host_buffer->EmplaceUniform(frag_info));
return pass.Draw().ok();
@ -244,8 +241,7 @@ TEST_P(RendererTest, CanRenderPerspectiveCube) {
ASSERT_TRUE(sampler);
Vector3 euler_angles;
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
SinglePassCallback callback = [&](RenderPass& pass) {
static Degrees fov_y(60);
static Scalar distance = 10;
@ -259,14 +255,17 @@ TEST_P(RendererTest, CanRenderPerspectiveCube) {
pass.SetPipeline(pipeline);
std::array<BufferView, 2> vertex_buffers = {
BufferView(device_buffer,
Range(offsetof(Cube, positions), sizeof(Cube::positions))),
BufferView(device_buffer,
Range(offsetof(Cube, colors), sizeof(Cube::colors))),
BufferView{
.buffer = device_buffer,
.range = Range(offsetof(Cube, positions), sizeof(Cube::positions))},
BufferView{
.buffer = device_buffer,
.range = Range(offsetof(Cube, colors), sizeof(Cube::colors))},
};
BufferView index_buffer(
device_buffer, Range(offsetof(Cube, indices), sizeof(Cube::indices)));
BufferView index_buffer = {
.buffer = device_buffer,
.range = Range(offsetof(Cube, indices), sizeof(Cube::indices))};
pass.SetVertexBuffer(vertex_buffers.data(), vertex_buffers.size());
pass.SetElementCount(36);
pass.SetIndexBuffer(index_buffer, IndexType::k16bit);
@ -325,8 +324,7 @@ TEST_P(RendererTest, CanRenderMultiplePrimitives) {
context->GetSamplerLibrary()->GetSampler({});
ASSERT_TRUE(sampler);
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
SinglePassCallback callback = [&](RenderPass& pass) {
for (size_t i = 0; i < 1; i++) {
for (size_t j = 0; j < 1; j++) {
@ -379,8 +377,7 @@ TEST_P(RendererTest, CanRenderToTexture) {
auto box_pipeline =
context->GetPipelineLibrary()->GetPipeline(pipeline_desc).Get();
ASSERT_TRUE(box_pipeline);
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
VertexBufferBuilder<VS::PerVertexData> vertex_builder;
vertex_builder.SetLabel("Box");
@ -502,8 +499,7 @@ TEST_P(RendererTest, CanRenderInstanced) {
instances.colors[i] = Color::Random();
}
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
ASSERT_TRUE(OpenPlaygroundHere([&](RenderPass& pass) -> bool {
pass.SetPipeline(pipeline);
pass.SetCommandLabel("InstancedDraw");
@ -574,8 +570,7 @@ TEST_P(RendererTest, CanBlitTextureToTexture) {
vertex_builder.CreateVertexBuffer(*context->GetResourceAllocator());
ASSERT_TRUE(vertex_buffer);
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
Playground::RenderCallback callback = [&](RenderTarget& render_target) {
auto buffer = context->CreateCommandBuffer();
if (!buffer) {
@ -695,8 +690,7 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
vertex_builder.CreateVertexBuffer(*context->GetResourceAllocator());
ASSERT_TRUE(vertex_buffer);
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
Playground::RenderCallback callback = [&](RenderTarget& render_target) {
{
auto buffer = context->CreateCommandBuffer();
@ -757,7 +751,7 @@ TEST_P(RendererTest, CanBlitTextureToBuffer) {
auto texture =
context->GetResourceAllocator()->CreateTexture(texture_desc);
if (!texture->SetContents(device_buffer->OnGetContents(),
buffer_view.GetRange().length)) {
buffer_view.range.length)) {
VALIDATION_LOG << "Could not upload texture to device memory";
return false;
}
@ -813,8 +807,7 @@ TEST_P(RendererTest, CanGenerateMipmaps) {
ASSERT_TRUE(vertex_buffer);
bool first_frame = true;
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
Playground::RenderCallback callback = [&](RenderTarget& render_target) {
const char* mip_filter_names[] = {"Base", "Nearest", "Linear"};
const MipFilter mip_filters[] = {MipFilter::kBase, MipFilter::kNearest,
@ -926,8 +919,7 @@ TEST_P(RendererTest, TheImpeller) {
"table_mountain_pz.png", "table_mountain_nz.png"});
const std::unique_ptr<const Sampler>& cube_map_sampler =
context->GetSamplerLibrary()->GetSampler({});
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
SinglePassCallback callback = [&](RenderPass& pass) {
auto size = pass.GetRenderTargetSize();
@ -976,8 +968,7 @@ TEST_P(RendererTest, Planet) {
context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
ASSERT_TRUE(pipeline && pipeline->IsValid());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
SinglePassCallback callback = [&](RenderPass& pass) {
static Scalar speed = 0.1;
@ -1043,8 +1034,7 @@ TEST_P(RendererTest, ArrayUniforms) {
context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
ASSERT_TRUE(pipeline && pipeline->IsValid());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
SinglePassCallback callback = [&](RenderPass& pass) {
auto size = pass.GetRenderTargetSize();
@ -1101,8 +1091,7 @@ TEST_P(RendererTest, InactiveUniforms) {
context->GetPipelineLibrary()->GetPipeline(pipeline_descriptor).Get();
ASSERT_TRUE(pipeline && pipeline->IsValid());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
SinglePassCallback callback = [&](RenderPass& pass) {
auto size = pass.GetRenderTargetSize();
@ -1267,8 +1256,7 @@ TEST_P(RendererTest, StencilMask) {
static int current_back_compare =
CompareFunctionUI().IndexOf(CompareFunction::kLessEqual);
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(context->GetResourceAllocator());
Playground::RenderCallback callback = [&](RenderTarget& render_target) {
auto buffer = context->CreateCommandBuffer();
if (!buffer) {
@ -1481,8 +1469,7 @@ TEST_P(RendererTest, CanSepiaToneWithSubpasses) {
ASSERT_TRUE(sampler);
SinglePassCallback callback = [&](RenderPass& pass) {
auto buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto buffer = HostBuffer::Create(context->GetResourceAllocator());
// Draw the texture.
{
@ -1575,8 +1562,7 @@ TEST_P(RendererTest, CanSepiaToneThenSwizzleWithSubpasses) {
ASSERT_TRUE(sampler);
SinglePassCallback callback = [&](RenderPass& pass) {
auto buffer = HostBuffer::Create(context->GetResourceAllocator(),
context->GetIdleWaiter());
auto buffer = HostBuffer::Create(context->GetResourceAllocator());
// Draw the texture.
{

4
engine/src/flutter/impeller/renderer/vertex_buffer_builder.h
View File

@ -138,7 +138,7 @@ class VertexBufferBuilder {
if (!label_.empty()) {
buffer->SetLabel(SPrintF("%s Vertices", label_.c_str()));
}
return DeviceBuffer::AsBufferView(std::move(buffer));
return DeviceBuffer::AsBufferView(buffer);
}
std::vector<IndexType> CreateIndexBuffer() const { return indices_; }
@ -167,7 +167,7 @@ class VertexBufferBuilder {
if (!label_.empty()) {
buffer->SetLabel(SPrintF("%s Indices", label_.c_str()));
}
return DeviceBuffer::AsBufferView(std::move(buffer));
return DeviceBuffer::AsBufferView(buffer);
}
};

30
engine/src/flutter/impeller/typographer/typographer_unittests.cc
View File

@ -81,8 +81,7 @@ TEST_P(TypographerTest, CanCreateGlyphAtlas) {
auto context = TypographerContextSkia::Make();
auto atlas_context =
context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
ASSERT_TRUE(context && context->IsValid());
SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
auto blob = SkTextBlob::MakeFromString("hello", sk_font);
@ -117,8 +116,7 @@ TEST_P(TypographerTest, CanCreateGlyphAtlas) {
}
TEST_P(TypographerTest, LazyAtlasTracksColor) {
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
#if FML_OS_MACOSX
auto mapping = flutter::testing::OpenFixtureAsSkData("Apple Color Emoji.ttc");
#else
@ -160,8 +158,7 @@ TEST_P(TypographerTest, GlyphAtlasWithOddUniqueGlyphSize) {
auto context = TypographerContextSkia::Make();
auto atlas_context =
context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
ASSERT_TRUE(context && context->IsValid());
SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
auto blob = SkTextBlob::MakeFromString("AGH", sk_font);
@ -181,8 +178,7 @@ TEST_P(TypographerTest, GlyphAtlasIsRecycledIfUnchanged) {
auto context = TypographerContextSkia::Make();
auto atlas_context =
context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
ASSERT_TRUE(context && context->IsValid());
SkFont sk_font = flutter::testing::CreateTestFontOfSize(12);
auto blob = SkTextBlob::MakeFromString("spooky skellingtons", sk_font);
@ -206,8 +202,7 @@ TEST_P(TypographerTest, GlyphAtlasIsRecycledIfUnchanged) {
}
TEST_P(TypographerTest, GlyphAtlasWithLotsOfdUniqueGlyphSize) {
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
auto context = TypographerContextSkia::Make();
auto atlas_context =
context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
@ -254,8 +249,7 @@ TEST_P(TypographerTest, GlyphAtlasWithLotsOfdUniqueGlyphSize) {
}
TEST_P(TypographerTest, GlyphAtlasTextureIsRecycledIfUnchanged) {
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
auto context = TypographerContextSkia::Make();
auto atlas_context =
context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
@ -292,8 +286,7 @@ TEST_P(TypographerTest, GlyphAtlasTextureIsRecycledIfUnchanged) {
}
TEST_P(TypographerTest, GlyphColorIsPartOfCacheKey) {
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
#if FML_OS_MACOSX
auto mapping = flutter::testing::OpenFixtureAsSkData("Apple Color Emoji.ttc");
#else
@ -327,8 +320,7 @@ TEST_P(TypographerTest, GlyphColorIsPartOfCacheKey) {
}
TEST_P(TypographerTest, GlyphColorIsIgnoredForNonEmojiFonts) {
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
sk_sp<SkFontMgr> font_mgr = txt::GetDefaultFontManager();
sk_sp<SkTypeface> typeface =
font_mgr->matchFamilyStyle("Arial", SkFontStyle::Normal());
@ -427,8 +419,7 @@ TEST_P(TypographerTest, GlyphAtlasTextureWillGrowTilMaxTextureSize) {
GTEST_SKIP() << "Atlas growth isn't supported for OpenGLES currently.";
}
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
auto context = TypographerContextSkia::Make();
auto atlas_context =
context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
@ -504,8 +495,7 @@ TEST_P(TypographerTest, TextFrameInitialBoundsArePlaceholder) {
auto context = TypographerContextSkia::Make();
auto atlas_context =
context->CreateGlyphAtlasContext(GlyphAtlas::Type::kAlphaBitmap);
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator(),
GetContext()->GetIdleWaiter());
auto host_buffer = HostBuffer::Create(GetContext()->GetResourceAllocator());
auto atlas = CreateGlyphAtlas(*GetContext(), context.get(), *host_buffer,
GlyphAtlas::Type::kAlphaBitmap, 1.0f,

18
engine/src/flutter/lib/gpu/render_pass.cc
View File

@ -312,8 +312,10 @@ static void BindVertexBuffer(
int offset_in_bytes,
int length_in_bytes,
int vertex_count) {
wrapper->vertex_buffer = impeller::BufferView(
buffer, impeller::Range(offset_in_bytes, length_in_bytes));
wrapper->vertex_buffer = impeller::BufferView{
.buffer = buffer,
.range = impeller::Range(offset_in_bytes, length_in_bytes),
};
// If the index type is set, then the `vertex_count` becomes the index
// count... So don't overwrite the count if it's already been set when binding
@ -346,8 +348,10 @@ static void BindIndexBuffer(
int index_type,
int index_count) {
impeller::IndexType type = flutter::gpu::ToImpellerIndexType(index_type);
wrapper->index_buffer = impeller::BufferView(
buffer, impeller::Range(offset_in_bytes, length_in_bytes));
wrapper->index_buffer = impeller::BufferView{
.buffer = buffer,
.range = impeller::Range(offset_in_bytes, length_in_bytes),
};
wrapper->index_buffer_type = type;
bool setting_index_buffer = type != impeller::IndexType::kNone;
@ -408,8 +412,10 @@ static bool BindUniform(
.slot = uniform_struct->slot,
.view = impeller::BufferResource{
&uniform_struct->metadata,
impeller::BufferView(
buffer, impeller::Range(offset_in_bytes, length_in_bytes)),
impeller::BufferView{
.buffer = buffer,
.range = impeller::Range(offset_in_bytes, length_in_bytes),
},
}});
return true;
}

3
engine/src/flutter/testing/run_tests.py
View File

@ -130,9 +130,8 @@ def run_cmd( # pylint: disable=too-many-arguments
for forbidden_string in forbidden_output:
if forbidden_string in output:
matches = [x.group(0) for x in re.findall(f'^.*{forbidden_string}.*$', output)]
raise RuntimeError(
f'command "{command_string}" contained forbidden string "{forbidden_string}": {matches}'
'command "%s" contained forbidden string "%s"' % (command_string, forbidden_string)
)
print_divider('<')