commit 37bc008a53d0b622561e3619701cde287add886c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Apr 01 20:54:31 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Apr 01 20:54:31 2025 -0700
tree eb79828567bf233a8ac59530934b880b1e3edc72
parent 3115163545c2f5b5857133e2d36c3230c04e93d4
parent a6962e8b814a3d166eaed9e0b9f7fd37a4d0e01a

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32697684'] into 25Q2-release.

Change-Id: I226a1a06b3029db375d353214d70a262fe0f43cf

vulkan/scripts/vk.py

diff --git a/vulkan/scripts/vk.py b/vulkan/scripts/vk.py
index 983e0dc..a68a99d 100644
--- a/vulkan/scripts/vk.py
+++ b/vulkan/scripts/vk.py
@@ -742,7 +742,7 @@
   pipelineProtectedAccess: VkBool32
   pipelineRobustness: VkBool32
   hostImageCopy: VkBool32
-  # pushDescriptor: bool
+  pushDescriptor: VkBool32
 
 
 @dataclass

vulkan/vkjson/vkjson.cc

diff --git a/vulkan/vkjson/vkjson.cc b/vulkan/vkjson/vkjson.cc
index 517e62d..45fb46c 100644
--- a/vulkan/vkjson/vkjson.cc
+++ b/vulkan/vkjson/vkjson.cc
@@ -1896,7 +1896,8 @@
       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>