diff options
author | 2025-04-01 20:54:31 -0700 | |
---|---|---|
committer | 2025-04-01 20:54:31 -0700 | |
commit | 37bc008a53d0b622561e3619701cde287add886c (patch) | |
tree | eb79828567bf233a8ac59530934b880b1e3edc72 | |
parent | 3115163545c2f5b5857133e2d36c3230c04e93d4 (diff) | |
parent | a6962e8b814a3d166eaed9e0b9f7fd37a4d0e01a (diff) |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32697684'] into 25Q2-release.
Change-Id: I226a1a06b3029db375d353214d70a262fe0f43cf
-rw-r--r-- | vulkan/scripts/vk.py | 2 | ||||
-rw-r--r-- | vulkan/vkjson/vkjson.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vulkan/scripts/vk.py b/vulkan/scripts/vk.py index 983e0dc296..a68a99dda7 100644 --- a/vulkan/scripts/vk.py +++ b/vulkan/scripts/vk.py @@ -742,7 +742,7 @@ class VkPhysicalDeviceVulkan14Features: pipelineProtectedAccess: VkBool32 pipelineRobustness: VkBool32 hostImageCopy: VkBool32 - # pushDescriptor: bool + pushDescriptor: VkBool32 @dataclass diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc index 517e62d1db..45fb46c09c 100644 --- a/vulkan/vkjson/vkjson.cc +++ b/vulkan/vkjson/vkjson.cc @@ -1896,7 +1896,8 @@ inline bool Iterate(Visitor* visitor, visitor->Visit("pipelineProtectedAccess", &features->pipelineProtectedAccess) && visitor->Visit("pipelineRobustness", &features->pipelineRobustness) && - visitor->Visit("hostImageCopy", &features->hostImageCopy); + visitor->Visit("hostImageCopy", &features->hostImageCopy) && + visitor->Visit("pushDescriptor", &features->pushDescriptor); } template <typename Visitor> |