From ad2565bcc67dfd3202903c987f8f549d273d3280 Mon Sep 17 00:00:00 2001 From: Serdar Kocdemir Date: Wed, 13 May 2026 16:26:22 +0000 Subject: [PATCH] gfxstream: update codegen for host side vulkan header update to v1.4.350 Also enables VK_KHR_swapchain_maintenance1, as the EXT now aliases the KHR version. Test: codegen && CI Reviewed-by: Gurchetan Singh Part-of: --- src/gfxstream/codegen/scripts/cereal/dispatch.py | 16 ++++++++-------- src/gfxstream/codegen/scripts/cerealgenerator.py | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/gfxstream/codegen/scripts/cereal/dispatch.py b/src/gfxstream/codegen/scripts/cereal/dispatch.py index c0e283d5500..0e5a5521936 100644 --- a/src/gfxstream/codegen/scripts/cereal/dispatch.py +++ b/src/gfxstream/codegen/scripts/cereal/dispatch.py @@ -173,10 +173,10 @@ bool vulkan_dispatch_check_%s_%s( const VulkanDispatch* vk); """ % (tag, featureToCheck)) - emit_feature_check_decl(self.cgenHeader, "instance", "VK_VERSION_1_0") - emit_feature_check_decl(self.cgenHeader, "instance", "VK_VERSION_1_1") - emit_feature_check_decl(self.cgenHeader, "device", "VK_VERSION_1_0") - emit_feature_check_decl(self.cgenHeader, "device", "VK_VERSION_1_1") + emit_feature_check_decl(self.cgenHeader, "instance", "VK_BASE_VERSION_1_0") + emit_feature_check_decl(self.cgenHeader, "instance", "VK_BASE_VERSION_1_1") + emit_feature_check_decl(self.cgenHeader, "device", "VK_BASE_VERSION_1_0") + emit_feature_check_decl(self.cgenHeader, "device", "VK_BASE_VERSION_1_1") self.cgenHeader.line("struct VulkanDispatch {") self.module.appendHeader(self.cgenHeader.swapCode()) @@ -331,10 +331,10 @@ bool vulkan_dispatch_check_%s_%s( instanceApis = self.apisToGet["global-instance"] + self.apisToGet["instance"] - emit_feature_check_impl(self, self.cgenImpl, "instance", "VK_VERSION_1_0", instanceApis) - emit_feature_check_impl(self, self.cgenImpl, "instance", "VK_VERSION_1_1", instanceApis) - emit_feature_check_impl(self, self.cgenImpl, "device", "VK_VERSION_1_0", self.apisToGet["device"]) - emit_feature_check_impl(self, self.cgenImpl, "device", "VK_VERSION_1_1", self.apisToGet["device"]) + emit_feature_check_impl(self, self.cgenImpl, "instance", "VK_BASE_VERSION_1_0", instanceApis) + emit_feature_check_impl(self, self.cgenImpl, "instance", "VK_BASE_VERSION_1_1", instanceApis) + emit_feature_check_impl(self, self.cgenImpl, "device", "VK_BASE_VERSION_1_0", self.apisToGet["device"]) + emit_feature_check_impl(self, self.cgenImpl, "device", "VK_BASE_VERSION_1_1", self.apisToGet["device"]) self.module.appendImpl(self.cgenImpl.swapCode()) diff --git a/src/gfxstream/codegen/scripts/cerealgenerator.py b/src/gfxstream/codegen/scripts/cerealgenerator.py index ef9f9c2b543..c546c7e3e33 100644 --- a/src/gfxstream/codegen/scripts/cerealgenerator.py +++ b/src/gfxstream/codegen/scripts/cerealgenerator.py @@ -165,6 +165,7 @@ SUPPORTED_FEATURES = [ "VK_KHR_maintenance7", "VK_KHR_maintenance8", "VK_KHR_maintenance9", + "VK_KHR_swapchain_maintenance1", ] HOST_MODULES = ["goldfish_vk_extension_structs", "goldfish_vk_marshaling", @@ -196,6 +197,7 @@ SUPPORTED_MODULES = { "VK_ANDROID_external_memory_android_hardware_buffer": ["goldfish_vk_dispatch", "func_table"], "VK_KHR_android_surface": ["func_table"], "VK_EXT_swapchain_maintenance1" : HOST_MODULES, + "VK_KHR_swapchain_maintenance1" : HOST_MODULES, "VK_KHR_swapchain" : HOST_MODULES, "VK_NV_device_diagnostic_checkpoints": ["goldfish_vk_dispatch"], "VK_KHR_ray_tracing_pipeline": ["goldfish_vk_dispatch"],