summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-18 04:54:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-18 04:54:23 +0000
commit413bb1206f958679c3faeadc09ac7859fa0414ca (patch)
tree561c1a2b07252020b1c7e5649d8dc9ae9865f02c
parent5b044d951c4e4b9f0c8739ba184b36a46ca64955 (diff)
parentf18af37115c4bb51b40599d21cd1b027ac6123a7 (diff)
downloadgfxstream-protocols-413bb1206f958679c3faeadc09ac7859fa0414ca.tar.gz
Snap for 9769041 from 1081ba2ea38197b67291bb01d3ccd8ed214573cf to udc-release am: f18af37115
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gfxstream-protocols/+/22148496 Change-Id: Id66d32d3924a7595196fd8215df71ed2f80eac72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--registry/vulkan/scripts/cereal/decoder.py3
-rw-r--r--registry/vulkan/scripts/cereal/encoder.py5
2 files changed, 4 insertions, 4 deletions
diff --git a/registry/vulkan/scripts/cereal/decoder.py b/registry/vulkan/scripts/cereal/decoder.py
index a41fe7ef..18fc296b 100644
--- a/registry/vulkan/scripts/cereal/decoder.py
+++ b/registry/vulkan/scripts/cereal/decoder.py
@@ -615,6 +615,9 @@ custom_decodes = {
"vkGetImageMemoryRequirements" : emit_global_state_wrapped_decoding,
"vkGetImageMemoryRequirements2" : emit_global_state_wrapped_decoding,
"vkGetImageMemoryRequirements2KHR" : emit_global_state_wrapped_decoding,
+ "vkGetBufferMemoryRequirements" : emit_global_state_wrapped_decoding,
+ "vkGetBufferMemoryRequirements2": emit_global_state_wrapped_decoding,
+ "vkGetBufferMemoryRequirements2KHR": emit_global_state_wrapped_decoding,
"vkCreateDescriptorSetLayout" : emit_global_state_wrapped_decoding,
"vkDestroyDescriptorSetLayout" : emit_global_state_wrapped_decoding,
diff --git a/registry/vulkan/scripts/cereal/encoder.py b/registry/vulkan/scripts/cereal/encoder.py
index 42d1e815..108d1228 100644
--- a/registry/vulkan/scripts/cereal/encoder.py
+++ b/registry/vulkan/scripts/cereal/encoder.py
@@ -79,9 +79,6 @@ ENCODER_CUSTOM_RESOURCE_POSTPROCESS = [
"vkGetPhysicalDeviceProperties",
"vkGetPhysicalDeviceProperties2",
"vkGetPhysicalDeviceProperties2KHR",
- "vkGetPhysicalDeviceMemoryProperties",
- "vkGetPhysicalDeviceMemoryProperties2",
- "vkGetPhysicalDeviceMemoryProperties2KHR",
"vkCreateDescriptorUpdateTemplate",
"vkCreateDescriptorUpdateTemplateKHR",
"vkGetPhysicalDeviceExternalSemaphoreProperties",
@@ -401,7 +398,7 @@ def emit_parameter_encode_do_parameter_write(typeInfo, api, cgen):
emit_marshal(typeInfo, p, cgen)
dispatchDone = True
-
+
cgen.beginIf("watchdog")
cgen.stmt("size_t watchdogBufSize = std::min<size_t>(static_cast<size_t>(packetSize_%s), kWatchdogBufferMax)" % (api.name))
cgen.stmt("healthMonitorAnnotation_packetContents.resize(watchdogBufSize)")