Module: Mesa Branch: main Commit: 1d12d7c33cadb3f0d0811ff47740ac63fd8edf7c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d12d7c33cadb3f0d0811ff47740ac63fd8edf7c
Author: Ryan Neph <[email protected]> Date: Fri Feb 10 16:45:21 2023 -0800 venus: update venus-protocol headers to fix WA1 Follow-up to previous commit, this time to fix encoding/decoding for VkDrmFormatModifierPropertiesListEXT::drmFormatModifierCount. Fixes a workaround (WA1) in the venus-protocol. Signed-off-by: Ryan Neph <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21395> --- src/virtio/venus-protocol/vn_protocol_driver.h | 2 +- src/virtio/venus-protocol/vn_protocol_driver_device.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/virtio/venus-protocol/vn_protocol_driver.h b/src/virtio/venus-protocol/vn_protocol_driver.h index f17c95d9a1a..2f1d0672778 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver.h +++ b/src/virtio/venus-protocol/vn_protocol_driver.h @@ -1,4 +1,4 @@ -/* This file is generated by venus-protocol git-7090f544. */ +/* This file is generated by venus-protocol git-67c7fc39. */ /* * Copyright 2020 Google LLC diff --git a/src/virtio/venus-protocol/vn_protocol_driver_device.h b/src/virtio/venus-protocol/vn_protocol_driver_device.h index 576f0506974..569da57cb6f 100644 --- a/src/virtio/venus-protocol/vn_protocol_driver_device.h +++ b/src/virtio/venus-protocol/vn_protocol_driver_device.h @@ -17413,7 +17413,7 @@ vn_sizeof_VkDrmFormatModifierPropertiesListEXT_self_partial(const VkDrmFormatMod { size_t size = 0; /* skip val->{sType,pNext} */ - /* WA1: size += vn_sizeof_uint32_t(&val->drmFormatModifierCount); */(void)0; + size += vn_sizeof_uint32_t(&val->drmFormatModifierCount); if (val->pDrmFormatModifierProperties) { size += vn_sizeof_array_size(val->drmFormatModifierCount); for (uint32_t i = 0; i < val->drmFormatModifierCount; i++) @@ -17447,7 +17447,7 @@ static inline void vn_encode_VkDrmFormatModifierPropertiesListEXT_self_partial(struct vn_cs_encoder *enc, const VkDrmFormatModifierPropertiesListEXT *val) { /* skip val->{sType,pNext} */ - /* WA1: vn_encode_uint32_t(enc, &val->drmFormatModifierCount); */(void)0; + vn_encode_uint32_t(enc, &val->drmFormatModifierCount); if (val->pDrmFormatModifierProperties) { vn_encode_array_size(enc, val->drmFormatModifierCount); for (uint32_t i = 0; i < val->drmFormatModifierCount; i++)
