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

[Impeller] playground upload to device private on macOS #41001

Merged
auto-submit merged 3 commits into from
Apr 10, 2023
Merged

[Impeller] playground upload to device private on macOS #41001

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6108dd8
[Impeller] playground upload to device private on macOS
Apr 7, 2023
bced3ef
Fix enable_mipmapping
Apr 7, 2023
831d921
Merge branch 'main' into fix_load_texture_for_desktop_mac
Apr 10, 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
49 changes: 49 additions & 0 deletions impeller/playground/playground.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,54 @@ std::shared_ptr<Texture> CreateTextureForDecompressedImage(
const std::shared_ptr<Context>& context,
DecompressedImage& decompressed_image,
bool enable_mipmapping) {
// TODO(https://github.com/flutter/flutter/issues/123468): copying buffers to
// textures is not implemented for GLES/Vulkan.
Comment on lines +403 to +404
Copy link
Member

@gaaclarke gaaclarke Apr 7, 2023

Choose a reason for hiding this comment

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

The comment doesn't seem to align with the #if. The if blocks a platform, the comment talks about backends.

Copy link
Contributor Author

@jonahwilliams jonahwilliams Apr 7, 2023

Choose a reason for hiding this comment

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

we don't have an ifdef for metal as far as I know. Technically macOS is only metal, except that we can run vulkan locally so this change breaks that without a modification to this code.

We can also fix this by finishing the blit pass implementation and removing the check altogether.

Copy link
Contributor Author

@jonahwilliams jonahwilliams Apr 7, 2023

Choose a reason for hiding this comment

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

Looks like this did break something, but hard to tell from CI logs.

#if FML_OS_MACOSX
impeller::TextureDescriptor texture_descriptor;
texture_descriptor.storage_mode = impeller::StorageMode::kDevicePrivate;
texture_descriptor.format = PixelFormat::kR8G8B8A8UNormInt;
texture_descriptor.size = decompressed_image.GetSize();
texture_descriptor.mip_count =
enable_mipmapping ? decompressed_image.GetSize().MipCount() : 1u;

auto dest_texture =
context->GetResourceAllocator()->CreateTexture(texture_descriptor);
if (!dest_texture) {
FML_DLOG(ERROR) << "Could not create Impeller texture.";
return nullptr;
}

auto buffer = context->GetResourceAllocator()->CreateBufferWithCopy(
*decompressed_image.GetAllocation().get());

dest_texture->SetLabel(
impeller::SPrintF("ui.Image(%p)", dest_texture.get()).c_str());

auto command_buffer = context->CreateCommandBuffer();
if (!command_buffer) {
FML_DLOG(ERROR) << "Could not create command buffer for mipmap generation.";
return nullptr;
}
command_buffer->SetLabel("Mipmap Command Buffer");

auto blit_pass = command_buffer->CreateBlitPass();
if (!blit_pass) {
FML_DLOG(ERROR) << "Could not create blit pass for mipmap generation.";
return nullptr;
}
blit_pass->SetLabel("Mipmap Blit Pass");
blit_pass->AddCopy(buffer->AsBufferView(), dest_texture);
if (texture_descriptor.size.MipCount() > 1) {
Copy link
Contributor Author

@jonahwilliams jonahwilliams Apr 7, 2023

Choose a reason for hiding this comment

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

Need to fix this

blit_pass->GenerateMipmap(dest_texture);
}

blit_pass->EncodeCommands(context->GetResourceAllocator());
if (!command_buffer->SubmitCommands()) {
FML_DLOG(ERROR) << "Failed to submit blit pass command buffer.";
return nullptr;
}
return dest_texture;
#else
auto texture_descriptor = TextureDescriptor{};
texture_descriptor.storage_mode = StorageMode::kHostVisible;
texture_descriptor.format = PixelFormat::kR8G8B8A8UNormInt;
Expand All @@ -420,6 +468,7 @@ std::shared_ptr<Texture> CreateTextureForDecompressedImage(
return nullptr;
}
return texture;
#endif // FML_OS_MACOS
}
} // namespace

Expand Down