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

[Impeller] Allocate fewer textures in dedicated memory and adjust buffer flags. #43313

Merged
auto-submit merged 14 commits into from
Jul 5, 2023
Merged

[Impeller] Allocate fewer textures in dedicated memory and adjust buffer flags. #43313

Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b6b5f80
[Impeller] allocate fewer textures in dedicated memory.
Jun 28, 2023
0798fe1
Update allocator_vk.cc
Jun 28, 2023
4826724
format
Jun 28, 2023
9c652d1
move to limits.vk
Jun 29, 2023
0eeccc9
++
Jun 29, 2023
660e641
merge and cleanup.
Jun 30, 2023
83aac9e
add sequential access.
Jun 30, 2023
4c7ea58
Update licenses_flutter
Jun 30, 2023
03c6d7a
Revert "Update licenses_flutter"
Jun 30, 2023
549d82e
Revert "add sequential access."
Jun 30, 2023
0091faa
back to preferred flags.
Jun 30, 2023
3d5b5ba
++
Jun 30, 2023
b14537b
Update licenses_flutter
Jun 30, 2023
5b5d7ed
Merge branch 'main' into dedicated_memory
Jul 5, 2023
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
24 changes: 19 additions & 5 deletions impeller/renderer/backend/vulkan/allocator_vk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

namespace impeller {

// Maximum size to use VMA image suballocation. Any allocation greater than or
// equal to this value will use a dedicated VkDeviceMemory.
constexpr size_t kImageSizeThresholdForDedicatedMemoryAllocation =
Copy link
Member

@chinmaygarde chinmaygarde Jun 29, 2023

Choose a reason for hiding this comment

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

Let's put these in a more discoverable place. I bet we will add more for buffers and all sort of other tunables. Perhaps //impeller/renderer/backend/vulkan/limits_vk.h? In a later patch is fine.

Copy link
Contributor Author

@jonahwilliams jonahwilliams Jun 29, 2023

Choose a reason for hiding this comment

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

Done

4 * 1024 * 1024;

AllocatorVK::AllocatorVK(std::weak_ptr<Context> context,
uint32_t vulkan_api_version,
const vk::PhysicalDevice& physical_device,
Expand Down Expand Up @@ -184,19 +189,25 @@ static constexpr VkMemoryPropertyFlags ToVKMemoryPropertyFlags(
}

static VmaAllocationCreateFlags ToVmaAllocationCreateFlags(StorageMode mode,
bool is_texture) {
bool is_texture,
size_t size) {
VmaAllocationCreateFlags flags = 0;
switch (mode) {
case StorageMode::kHostVisible:
if (is_texture) {
flags |= {};
if (size >= kImageSizeThresholdForDedicatedMemoryAllocation) {
flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;
} else {
flags |= {};
}
} else {
flags |= VMA_ALLOCATION_CREATE_HOST_ACCESS_RANDOM_BIT;
Copy link
Contributor Author

@jonahwilliams jonahwilliams Jun 30, 2023

Choose a reason for hiding this comment

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

The random access bit was the one causing problems. We shouldn't need this since the memory is coherent for reading in the GPU and we're not using it to readback data on the CPU

flags |= VMA_ALLOCATION_CREATE_MAPPED_BIT;
}
return flags;
case StorageMode::kDevicePrivate:
if (is_texture) {
if (is_texture &&
size >= kImageSizeThresholdForDedicatedMemoryAllocation) {
flags |= VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT;
}
return flags;
Expand Down Expand Up @@ -234,7 +245,9 @@ class AllocatedTextureSourceVK final : public TextureSourceVK {

alloc_nfo.usage = ToVMAMemoryUsage();
alloc_nfo.preferredFlags = ToVKMemoryPropertyFlags(desc.storage_mode);
alloc_nfo.flags = ToVmaAllocationCreateFlags(desc.storage_mode, true);
alloc_nfo.flags =
ToVmaAllocationCreateFlags(desc.storage_mode, /*is_texture=*/true,
desc.GetByteSizeOfBaseMipLevel());

auto create_info_native =
static_cast<vk::ImageCreateInfo::NativeType>(image_info);
Expand Down Expand Up @@ -366,7 +379,8 @@ std::shared_ptr<DeviceBuffer> AllocatorVK::OnCreateBuffer(
VmaAllocationCreateInfo allocation_info = {};
allocation_info.usage = ToVMAMemoryUsage();
allocation_info.preferredFlags = ToVKMemoryPropertyFlags(desc.storage_mode);
allocation_info.flags = ToVmaAllocationCreateFlags(desc.storage_mode, false);
allocation_info.flags = ToVmaAllocationCreateFlags(
desc.storage_mode, /*is_texture=*/false, desc.size);

VkBuffer buffer = {};
VmaAllocation buffer_allocation = {};
Expand Down