Snap for 9841731 from 0ee5de1c681c791f1d296801bd8a2b0120250705 to udc-d1-release

Change-Id: I8b245c761559010d0c00cf132f9a5594aef19747

6 files changed, 3 insertions, 36 deletions

diff --git a/registry/vulkan/scripts/cereal/common/codegen.py b/registry/vulkan/scripts/cereal/common/codegen.py
index 0fcac4ae..316eaa57 100644
--- a/registry/vulkan/scripts/cereal/common/codegen.py
+++ b/registry/vulkan/scripts/cereal/common/codegen.py
@@ -947,7 +947,6 @@ class VulkanWrapperGenerator(object):
         },
         "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT": {
             "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2": "VkPhysicalDeviceFragmentDensityMapPropertiesEXT",
-            "VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO": "VkImportPhysicalAddressGOOGLE",
             "default": "VkPhysicalDeviceFragmentDensityMapPropertiesEXT",
         },
         "VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT": {
diff --git a/registry/vulkan/scripts/cereal/common/vulkantypes.py b/registry/vulkan/scripts/cereal/common/vulkantypes.py
index 31284e26..dc3a9072 100644
--- a/registry/vulkan/scripts/cereal/common/vulkantypes.py
+++ b/registry/vulkan/scripts/cereal/common/vulkantypes.py
@@ -750,7 +750,7 @@ class VulkanCompoundType(object):
 
 class VulkanAPI(object):
 
-    def __init__(self, name: str, retType: VulkanType, parameters: list[VulkanType], origName=None):
+    def __init__(self, name: str, retType: VulkanType, parameters, origName=None):
         self.name: str = name
         self.origName = name
         self.retType: VulkanType = retType
diff --git a/registry/vulkan/scripts/cereal/decoder.py b/registry/vulkan/scripts/cereal/decoder.py
index 18fc296b..3e826c90 100644
--- a/registry/vulkan/scripts/cereal/decoder.py
+++ b/registry/vulkan/scripts/cereal/decoder.py
@@ -688,10 +688,6 @@ custom_decodes = {
     "vkMapMemoryIntoAddressSpaceGOOGLE" : emit_global_state_wrapped_decoding,
     "vkGetMemoryHostAddressInfoGOOGLE" : emit_global_state_wrapped_decoding,
 
-    # VK_GOOGLE_color_buffer
-    "vkRegisterImageColorBufferGOOGLE" : emit_global_state_wrapped_decoding,
-    "vkRegisterBufferColorBufferGOOGLE" : emit_global_state_wrapped_decoding,
-
     # Descriptor update templates
     "vkCreateDescriptorUpdateTemplate" : emit_global_state_wrapped_decoding,
     "vkCreateDescriptorUpdateTemplateKHR" : emit_global_state_wrapped_decoding,
diff --git a/registry/vulkan/scripts/cereal/marshalingdefs.py b/registry/vulkan/scripts/cereal/marshalingdefs.py
index 19b08d12..57472a65 100644
--- a/registry/vulkan/scripts/cereal/marshalingdefs.py
+++ b/registry/vulkan/scripts/cereal/marshalingdefs.py
@@ -332,8 +332,6 @@ KNOWN_FUNCTION_OPCODES = {
     "vkCmdSetCheckpointNV": 20315,
     "vkGetQueueCheckpointDataNV": 20316,
     "vkMapMemoryIntoAddressSpaceGOOGLE": 20317,
-    "vkRegisterImageColorBufferGOOGLE": 20318,
-    "vkRegisterBufferColorBufferGOOGLE": 20319,
     "vkUpdateDescriptorSetWithTemplateSizedGOOGLE": 20320,
     "vkBeginCommandBufferAsyncGOOGLE": 20321,
     "vkEndCommandBufferAsyncGOOGLE": 20322,
diff --git a/registry/vulkan/scripts/cereal/wrapperdefs.py b/registry/vulkan/scripts/cereal/wrapperdefs.py
index 6d89197e..b055f38f 100644
--- a/registry/vulkan/scripts/cereal/wrapperdefs.py
+++ b/registry/vulkan/scripts/cereal/wrapperdefs.py
@@ -98,7 +98,6 @@ STYPE_OVERRIDE = {
     "VkPhysicalDeviceFragmentDensityMapPropertiesEXT": "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT",
     "VkRenderPassFragmentDensityMapCreateInfoEXT": "VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT",
     "VkImportColorBufferGOOGLE": "VK_STRUCTURE_TYPE_IMPORT_COLOR_BUFFER_GOOGLE",
-    "VkImportPhysicalAddressGOOGLE": "VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE",
     "VkImportBufferGOOGLE": "VK_STRUCTURE_TYPE_IMPORT_BUFFER_GOOGLE",
 }
 
diff --git a/registry/vulkan/xml/vk.xml b/registry/vulkan/xml/vk.xml
index 0e19344e..dee3fcf8 100644
--- a/registry/vulkan/xml/vk.xml
+++ b/registry/vulkan/xml/vk.xml
@@ -5462,15 +5462,6 @@ typedef void <name>CAMetalLayer</name>;
             <member><type>void</type>*                  <name>pNext</name></member>
             <member><type>uint32_t</type>   <name>buffer</name></member>
         </type>
-        <type category="struct" name="VkImportPhysicalAddressGOOGLE" structextends="VkMemoryAllocateInfo">
-            <member values="VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE"><type>VkStructureType</type> <name>sType</name></member>
-            <member><type>void</type>*                  <name>pNext</name></member>
-            <member><type>uint64_t</type>   <name>physicalAddress</name></member>
-            <member><type>VkDeviceSize</type>   <name>size</name></member>
-            <member><type>VkFormat</type>   <name>format</name></member>
-            <member><type>VkImageTiling</type>   <name>tiling</name></member>
-            <member><type>uint32_t</type>   <name>tilingParameter</name></member>
-        </type>
         <type category="struct" name="VkPhysicalDeviceMutableDescriptorTypeFeaturesVALVE" structextends="VkPhysicalDeviceFeatures2,VkDeviceCreateInfo">
             <member values="VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_VALVE"><type>VkStructureType</type> <name>sType</name></member>
             <member optional="true" noautovalidity="true"><type>void</type>*                     <name>pNext</name></member>
@@ -10222,18 +10213,6 @@ typedef void <name>CAMetalLayer</name>;
             <param externsync="true" devicememoryhandle="1"><type>VkDeviceMemory</type> <name>memory</name></param>
             <param optional="false,true"><type>uint64_t</type>* <name>pAddress</name></param>
         </command>
-        <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
-            <proto><type>VkResult</type> <name>vkRegisterImageColorBufferGOOGLE</name></proto>
-            <param><type>VkDevice</type> <name>device</name></param>
-            <param><type>VkImage</type> <name>image</name></param>
-            <param><type>uint32_t</type> <name>colorBuffer</name></param>
-        </command>
-        <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INITIALIZATION_FAILED,VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_OUT_OF_DEVICE_MEMORY">
-            <proto><type>VkResult</type> <name>vkRegisterBufferColorBufferGOOGLE</name></proto>
-            <param><type>VkDevice</type> <name>device</name></param>
-            <param><type>VkBuffer</type> <name>buffer</name></param>
-            <param><type>uint32_t</type> <name>colorBuffer</name></param>
-        </command>
         <command>
             <proto><type>void</type> <name>vkUpdateDescriptorSetWithTemplateSizedGOOGLE</name></proto>
             <param><type>VkDevice</type> <name>device</name></param>
@@ -17657,14 +17636,10 @@ typedef void <name>CAMetalLayer</name>;
                 <enum value="386"                                           name="VK_GOOGLE_GFXSTREAM_NUMBER"/>
                 <enum value="&quot;VK_GOOGLE_gfxstream&quot;"               name="VK_GOOGLE_GFXSTREAM_EXTENSION_NAME"/>
                 <enum offset="0" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_IMPORT_COLOR_BUFFER_GOOGLE"/>
-                <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_IMPORT_PHYSICAL_ADDRESS_GOOGLE"/>
-                <enum offset="2" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_IMPORT_BUFFER_HANDLE_GOOGLE"/>
-                <enum offset="3" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_IMPORT_BUFFER_GOOGLE"/>
+                <enum offset="1" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_IMPORT_BUFFER_HANDLE_GOOGLE"/>
+                <enum offset="2" extends="VkStructureType"                  name="VK_STRUCTURE_TYPE_IMPORT_BUFFER_GOOGLE"/>
                 <type name="VkImportColorBufferGOOGLE"/>
                 <type name="VkImportBufferGOOGLE"/>
-                <type name="VkImportPhysicalAddressGOOGLE"/>
-                <command name="vkRegisterImageColorBufferGOOGLE"/>
-                <command name="vkRegisterBufferColorBufferGOOGLE"/>
                 <command name="vkMapMemoryIntoAddressSpaceGOOGLE"/>
                 <command name="vkUpdateDescriptorSetWithTemplateSizedGOOGLE"/>
                 <command name="vkBeginCommandBufferAsyncGOOGLE"/>