summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Chang <louischang@google.com>2022-01-06 01:50:40 +0000
committerLouis Chang <louischang@google.com>2022-01-06 01:50:40 +0000
commitb97d4e1dd89a24938d1981f708a3b47a6b76842b (patch)
treee02940c606f1e7e84ab79f23c2e647090a536604
parentf5ce3cee359635c7a493e18f058d3f080426881e (diff)
downloadgfxstream-protocols-b97d4e1dd89a24938d1981f708a3b47a6b76842b.tar.gz
Revert "vulkan-198[3]: Add 1.2.198 structs for special handling"
Revert submission 1936298-vk-198 Reason for revert: build break, see b/213387439 Reverted Changes: I54806807b:vulkan-198[G1]: Support building on old version of... I26eff7a39:vulkan-198[G3]: guest codegen Ib33eab698:vulkan-198[G2]: Update guest handle list. I9544126f3:vulkan-198[5]: host codegen I2ad28ff23:vulkan-198[4]: Update host handle list. Iad30ec94a:vulkan-198[3]: Add 1.2.198 structs for special han... I6d996641a:vulkan-198[2]: Update Vulkan cereal registry to up... Change-Id: I6327c4df7c5e86f2a13f3d9c230c2128a80e584f
-rw-r--r--registry/vulkan/xml/cereal/marshalingdefs.py102
1 files changed, 0 insertions, 102 deletions
diff --git a/registry/vulkan/xml/cereal/marshalingdefs.py b/registry/vulkan/xml/cereal/marshalingdefs.py
index 19b08d12..a351d86d 100644
--- a/registry/vulkan/xml/cereal/marshalingdefs.py
+++ b/registry/vulkan/xml/cereal/marshalingdefs.py
@@ -404,108 +404,6 @@ memcpy((uint64_t*)&{newInputVarName}->accelerationStructureReference, *ptr, size
*ptr += sizeof(uint64_t);
""",
},
- "VkAccelerationStructureMatrixMotionInstanceNV": {
- "common": """
-typedef struct VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields {
- VkTransformMatrixKHR transformT0;
- VkTransformMatrixKHR transformT1;
- uint32_t dwords[2];
- uint64_t accelerationStructureReference;
-} VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields;
-""",
- "marshaling": """
-const VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields* {newInputVarName} = (const VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields*)({inputVarName});
-marshal_VkTransformMatrixKHR({streamVarName}, {rootTypeVarName}, (VkTransformMatrixKHR*)(&{newInputVarName}->transformT0));
-marshal_VkTransformMatrixKHR({streamVarName}, {rootTypeVarName}, (VkTransformMatrixKHR*)(&{newInputVarName}->transformT1));
-for (uint32_t i = 0; i < 2; i++) {{
- {streamVarName}->write((uint32_t*)&({newInputVarName}->dwords[i]), sizeof(uint32_t));
-}}
-{streamVarName}->write((uint64_t*)&{newInputVarName}->accelerationStructureReference, sizeof(uint64_t));
-""",
- "unmarshaling": """
-VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields* {newInputVarName} = (VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields*)({inputVarName});
-unmarshal_VkTransformMatrixKHR({streamVarName}, {rootTypeVarName}, (VkTransformMatrixKHR*)(&{newInputVarName}->transformT0));
-unmarshal_VkTransformMatrixKHR({streamVarName}, {rootTypeVarName}, (VkTransformMatrixKHR*)(&{newInputVarName}->transformT1));
-for (uint32_t i = 0; i < 2; i++) {{
- {streamVarName}->read((uint32_t*)&({newInputVarName}->dwords[i]), sizeof(uint32_t));
-}}
-{streamVarName}->read((uint64_t*)&{newInputVarName}->accelerationStructureReference, sizeof(uint64_t));
-""",
- "reservedmarshaling": """
-(void)vkStream;
-const VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields* {newInputVarName} = (const VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields*)({inputVarName});
-reservedmarshal_VkTransformMatrixKHR({streamVarName}, {rootTypeVarName}, (VkTransformMatrixKHR*)(&{newInputVarName}->transformT0), ptr);
-reservedmarshal_VkTransformMatrixKHR({streamVarName}, {rootTypeVarName}, (VkTransformMatrixKHR*)(&{newInputVarName}->transformT1), ptr);
-for (uint32_t i = 0; i < 2; i++) {{
- memcpy(*ptr, (uint32_t*)&({newInputVarName}->dwords[i]), sizeof(uint32_t));
- *ptr += sizeof(uint32_t);
-}}
-memcpy(*ptr, (uint64_t*)&{newInputVarName}->accelerationStructureReference, sizeof(uint64_t));
-*ptr += sizeof(uint64_t);
-""",
- "reservedunmarshaling": """
-VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields* {newInputVarName} = (VkAccelerationStructureMatrixMotionInstanceNVWithoutBitFields*)({inputVarName});
-reservedunmarshal_VkTransformMatrixKHR({streamVarName}, {rootTypeVarName}, (VkTransformMatrixKHR*)(&{newInputVarName}->transformT0), ptr);
-reservedunmarshal_VkTransformMatrixKHR({streamVarName}, {rootTypeVarName}, (VkTransformMatrixKHR*)(&{newInputVarName}->transformT1), ptr);
-for (uint32_t i = 0; i < 2; i++) {{
- memcpy((uint32_t*)&({newInputVarName}->dwords[i]), *ptr, sizeof(uint32_t));
- *ptr += sizeof(uint32_t);
-}}
-memcpy((uint64_t*)&{newInputVarName}->accelerationStructureReference, *ptr, sizeof(uint64_t));
-*ptr += sizeof(uint64_t);
-""",
- },
- "VkAccelerationStructureSRTMotionInstanceNV": {
- "common": """
-typedef struct VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields {
- VkSRTDataNV transformT0;
- VkSRTDataNV transformT1;
- uint32_t dwords[2];
- uint64_t accelerationStructureReference;
-} VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields;
-""",
- "marshaling": """
-const VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields* {newInputVarName} = (const VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields*)({inputVarName});
-marshal_VkSRTDataNV({streamVarName}, {rootTypeVarName}, (VkSRTDataNV*)(&{newInputVarName}->transformT0));
-marshal_VkSRTDataNV({streamVarName}, {rootTypeVarName}, (VkSRTDataNV*)(&{newInputVarName}->transformT1));
-for (uint32_t i = 0; i < 2; i++) {{
- {streamVarName}->write((uint32_t*)&({newInputVarName}->dwords[i]), sizeof(uint32_t));
-}}
-{streamVarName}->write((uint64_t*)&{newInputVarName}->accelerationStructureReference, sizeof(uint64_t));
-""",
- "unmarshaling": """
-VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields* {newInputVarName} = (VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields*)({inputVarName});
-unmarshal_VkSRTDataNV({streamVarName}, {rootTypeVarName}, (VkSRTDataNV*)(&{newInputVarName}->transformT0));
-unmarshal_VkSRTDataNV({streamVarName}, {rootTypeVarName}, (VkSRTDataNV*)(&{newInputVarName}->transformT1));
-for (uint32_t i = 0; i < 2; i++) {{
- {streamVarName}->read((uint32_t*)&({newInputVarName}->dwords[i]), sizeof(uint32_t));
-}}
-{streamVarName}->read((uint64_t*)&{newInputVarName}->accelerationStructureReference, sizeof(uint64_t));
-""",
- "reservedmarshaling": """
-(void)vkStream;
-const VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields* {newInputVarName} = (const VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields*)({inputVarName});
-reservedmarshal_VkSRTDataNV({streamVarName}, {rootTypeVarName}, (VkSRTDataNV*)(&{newInputVarName}->transformT0), ptr);
-reservedmarshal_VkSRTDataNV({streamVarName}, {rootTypeVarName}, (VkSRTDataNV*)(&{newInputVarName}->transformT1), ptr);
-for (uint32_t i = 0; i < 2; i++) {{
- memcpy(*ptr, (uint32_t*)&({newInputVarName}->dwords[i]), sizeof(uint32_t));
- *ptr += sizeof(uint32_t);
-}}
-memcpy(*ptr, (uint64_t*)&{newInputVarName}->accelerationStructureReference, sizeof(uint64_t));
-*ptr += sizeof(uint64_t);
-""",
- "reservedunmarshaling": """
-VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields* {newInputVarName} = (VkAccelerationStructureSRTMotionInstanceNVWithoutBitFields*)({inputVarName});
-reservedunmarshal_VkSRTDataNV({streamVarName}, {rootTypeVarName}, (VkSRTDataNV*)(&{newInputVarName}->transformT0), ptr);
-reservedunmarshal_VkSRTDataNV({streamVarName}, {rootTypeVarName}, (VkSRTDataNV*)(&{newInputVarName}->transformT1), ptr);
-for (uint32_t i = 0; i < 2; i++) {{
- memcpy((uint32_t*)&({newInputVarName}->dwords[i]), *ptr, sizeof(uint32_t));
- *ptr += sizeof(uint32_t);
-}}
-memcpy((uint64_t*)&{newInputVarName}->accelerationStructureReference, *ptr, sizeof(uint64_t));
-*ptr += sizeof(uint64_t);
-""",
- },
"VkXcbSurfaceCreateInfoKHR": {
"common": """
// This struct should never be marshaled / unmarshaled.