From bcb9d258c2579ea86b56dee9dd9c4c9a71b96d88 Mon Sep 17 00:00:00 2001 From: Powei Feng Date: Mon, 5 Jan 2026 20:27:07 -0800 Subject: [PATCH] vk: fix broken android build (#9574) Should use VK_NULL_HANDLE instead of nullptr where applicable in VulkanPipelineCache. --- filament/backend/src/vulkan/VulkanPipelineCache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filament/backend/src/vulkan/VulkanPipelineCache.cpp b/filament/backend/src/vulkan/VulkanPipelineCache.cpp index 1133dee8e1..bf016cc863 100644 --- a/filament/backend/src/vulkan/VulkanPipelineCache.cpp +++ b/filament/backend/src/vulkan/VulkanPipelineCache.cpp @@ -107,7 +107,7 @@ VulkanPipelineCache::PipelineCacheEntry* VulkanPipelineCache::getOrCreatePipelin .handle = createPipeline(mPipelineRequirements), .lastUsed = mCurrentTime, }; - assert_invariant(cacheEntry.handle != nullptr && "Pipeline handle is nullptr"); + assert_invariant(cacheEntry.handle != VK_NULL_HANDLE && "Pipeline handle is nullptr"); return &mPipelines.emplace(mPipelineRequirements, cacheEntry).first.value(); } @@ -306,7 +306,7 @@ VkPipeline VulkanPipelineCache::createPipeline(const PipelineKey& key) noexcept assert_invariant(error == VK_SUCCESS); if (error != VK_SUCCESS) { FVK_LOGE << "vkCreateGraphicsPipelines error " << error; - return nullptr; + return VK_NULL_HANDLE; } return pipeline; }