Skip to content

VK: Fix AHB import validation error #9710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phoenixxxx merged 1 commit into from
Feb 12, 2026
Merged

VK: Fix AHB import validation error #9710

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions filament/backend/src/vulkan/platform/VulkanPlatformAndroid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ VkFormat transformVkFormat(VkFormat format, bool sRGB) {
return format;
}

bool isFormatSrgb(VkFormat format) {
return format == VK_FORMAT_R8G8B8A8_SRGB || format == VK_FORMAT_R8G8B8_SRGB;
}

bool isProtectedFromUsage(uint64_t usage) {
return usage & AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT;
}
Expand Down Expand Up @@ -367,7 +371,7 @@ VulkanPlatform::ImageData VulkanPlatformAndroid::createVkImageFromExternal(
.pViewFormats = formats,
};

if (fvkExternalImage->sRGB) {
if (isFormatSrgb(metadata.format)) {
formats[0] = metadata.format;
formats[1] = transformVkFormat(metadata.format, /*sRGB=*/false);
imageFormatListInfo.pNext = externalCreateInfo.pNext;
Expand All @@ -377,7 +381,7 @@ VulkanPlatform::ImageData VulkanPlatformAndroid::createVkImageFromExternal(
VkImageCreateInfo const imageInfo = {
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
.pNext = &externalCreateInfo,
.flags = fvkExternalImage->sRGB ? VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT : 0u,
.flags = isFormatSrgb(metadata.format) ? VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT : 0u,
.imageType = VK_IMAGE_TYPE_2D,
// For non external images, use the same format as the AHB, which isn't in SRGB
// Fix VUID-VkMemoryAllocateInfo-pNext-02387
Expand Down
Loading