From 117f3cb1fc4e009bae193f8003ff9c251bbf7d3c Mon Sep 17 00:00:00 2001 From: Serdar Kocdemir Date: Fri, 24 Apr 2026 14:59:02 +0100 Subject: [PATCH] gfxstream: allow VK_KHR_maintenance extensions Add latest maintenance extensions required by Android Vulkan requirements, except VK_KHR_maintenance5 which enables dynamic rendering on ANGLE and causes issues with some cuttlefish targets. Test: CI Reviewed-by: Aaron Ruby Part-of: --- src/gfxstream/codegen/scripts/cerealgenerator.py | 4 ++++ src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/gfxstream/codegen/scripts/cerealgenerator.py b/src/gfxstream/codegen/scripts/cerealgenerator.py index a0a67588cd6..ef9f9c2b543 100644 --- a/src/gfxstream/codegen/scripts/cerealgenerator.py +++ b/src/gfxstream/codegen/scripts/cerealgenerator.py @@ -161,6 +161,10 @@ SUPPORTED_FEATURES = [ # Android requirements "VK_EXT_pipeline_protected_access", + "VK_KHR_maintenance6", + "VK_KHR_maintenance7", + "VK_KHR_maintenance8", + "VK_KHR_maintenance9", ] HOST_MODULES = ["goldfish_vk_extension_structs", "goldfish_vk_marshaling", diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp index 29b8fcddd4e..de800f28580 100644 --- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp +++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp @@ -1883,6 +1883,10 @@ VkResult ResourceTracker::on_vkEnumerateDeviceExtensionProperties( // Android requirements "VK_EXT_pipeline_protected_access", + "VK_KHR_maintenance6", + "VK_KHR_maintenance7", + "VK_KHR_maintenance8", + "VK_KHR_maintenance9", }; VkEncoder* enc = (VkEncoder*)context;