AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

venus: sync protocol fixes and support for VK_EXT_pci_bus_info

Browse Source 
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20310>
This commit is contained in:
Yiwei Zhang
2022-12-16 00:21:47 -08:00
parent 18f4dc6b75
commit 63cb570ef3
4 changed files with 162 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/virtio/venus-protocol/vn_protocol_driver.h
+1 -1
View File
@@ -1,4 +1,4 @@
/* This file is generated by venus-protocol git-358504e3. */
/* This file is generated by venus-protocol git-c692a30d. */
/*
* Copyright 2020 Google LLC
src/virtio/venus-protocol/vn_protocol_driver_device.h
+152 -4
View File
@@ -14310,6 +14310,126 @@ vn_encode_VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT_partial(struct vn_
vn_encode_VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT_self_partial(enc, val);
}
/* struct VkPhysicalDevicePCIBusInfoPropertiesEXT chain */
static inline size_t
vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_pnext(const void *val)
{
/* no known/supported struct */
return vn_sizeof_simple_pointer(NULL);
}
static inline size_t
vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_self(const VkPhysicalDevicePCIBusInfoPropertiesEXT *val)
{
size_t size = 0;
/* skip val->{sType,pNext} */
size += vn_sizeof_uint32_t(&val->pciDomain);
size += vn_sizeof_uint32_t(&val->pciBus);
size += vn_sizeof_uint32_t(&val->pciDevice);
size += vn_sizeof_uint32_t(&val->pciFunction);
return size;
}
static inline size_t
vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT(const VkPhysicalDevicePCIBusInfoPropertiesEXT *val)
{
size_t size = 0;
size += vn_sizeof_VkStructureType(&val->sType);
size += vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_pnext(val->pNext);
size += vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_self(val);
return size;
}
static inline void
vn_decode_VkPhysicalDevicePCIBusInfoPropertiesEXT_pnext(struct vn_cs_decoder *dec, const void *val)
{
/* no known/supported struct */
if (vn_decode_simple_pointer(dec))
assert(false);
}
static inline void
vn_decode_VkPhysicalDevicePCIBusInfoPropertiesEXT_self(struct vn_cs_decoder *dec, VkPhysicalDevicePCIBusInfoPropertiesEXT *val)
{
/* skip val->{sType,pNext} */
vn_decode_uint32_t(dec, &val->pciDomain);
vn_decode_uint32_t(dec, &val->pciBus);
vn_decode_uint32_t(dec, &val->pciDevice);
vn_decode_uint32_t(dec, &val->pciFunction);
}
static inline void
vn_decode_VkPhysicalDevicePCIBusInfoPropertiesEXT(struct vn_cs_decoder *dec, VkPhysicalDevicePCIBusInfoPropertiesEXT *val)
{
VkStructureType stype;
vn_decode_VkStructureType(dec, &stype);
assert(stype == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT);
assert(val->sType == stype);
vn_decode_VkPhysicalDevicePCIBusInfoPropertiesEXT_pnext(dec, val->pNext);
vn_decode_VkPhysicalDevicePCIBusInfoPropertiesEXT_self(dec, val);
}
static inline size_t
vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_pnext_partial(const void *val)
{
/* no known/supported struct */
return vn_sizeof_simple_pointer(NULL);
}
static inline size_t
vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_self_partial(const VkPhysicalDevicePCIBusInfoPropertiesEXT *val)
{
size_t size = 0;
/* skip val->{sType,pNext} */
/* skip val->pciDomain */
/* skip val->pciBus */
/* skip val->pciDevice */
/* skip val->pciFunction */
return size;
}
static inline size_t
vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_partial(const VkPhysicalDevicePCIBusInfoPropertiesEXT *val)
{
size_t size = 0;
size += vn_sizeof_VkStructureType(&val->sType);
size += vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_pnext_partial(val->pNext);
size += vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_self_partial(val);
return size;
}
static inline void
vn_encode_VkPhysicalDevicePCIBusInfoPropertiesEXT_pnext_partial(struct vn_cs_encoder *enc, const void *val)
{
/* no known/supported struct */
vn_encode_simple_pointer(enc, NULL);
}
static inline void
vn_encode_VkPhysicalDevicePCIBusInfoPropertiesEXT_self_partial(struct vn_cs_encoder *enc, const VkPhysicalDevicePCIBusInfoPropertiesEXT *val)
{
/* skip val->{sType,pNext} */
/* skip val->pciDomain */
/* skip val->pciBus */
/* skip val->pciDevice */
/* skip val->pciFunction */
}
static inline void
vn_encode_VkPhysicalDevicePCIBusInfoPropertiesEXT_partial(struct vn_cs_encoder *enc, const VkPhysicalDevicePCIBusInfoPropertiesEXT *val)
{
assert(val->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT);
vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT });
vn_encode_VkPhysicalDevicePCIBusInfoPropertiesEXT_pnext_partial(enc, val->pNext);
vn_encode_VkPhysicalDevicePCIBusInfoPropertiesEXT_self_partial(enc, val);
}
/* struct VkPhysicalDeviceDepthStencilResolveProperties chain */
static inline size_t
@@ -16382,6 +16502,14 @@ vn_sizeof_VkPhysicalDeviceProperties2_pnext(const void *val)
size += vn_sizeof_VkPhysicalDeviceProperties2_pnext(pnext->pNext);
size += vn_sizeof_VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT_self((const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *)pnext);
return size;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT:
if (!vn_cs_renderer_protocol_has_extension(213 /* VK_EXT_pci_bus_info */))
break;
size += vn_sizeof_simple_pointer(pnext);
size += vn_sizeof_VkStructureType(&pnext->sType);
size += vn_sizeof_VkPhysicalDeviceProperties2_pnext(pnext->pNext);
size += vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_self((const VkPhysicalDevicePCIBusInfoPropertiesEXT *)pnext);
return size;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES:
size += vn_sizeof_simple_pointer(pnext);
size += vn_sizeof_VkStructureType(&pnext->sType);
@@ -16590,6 +16718,10 @@ vn_decode_VkPhysicalDeviceProperties2_pnext(struct vn_cs_decoder *dec, const voi
vn_decode_VkPhysicalDeviceProperties2_pnext(dec, pnext->pNext);
vn_decode_VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT_self(dec, (VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *)pnext);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT:
vn_decode_VkPhysicalDeviceProperties2_pnext(dec, pnext->pNext);
vn_decode_VkPhysicalDevicePCIBusInfoPropertiesEXT_self(dec, (VkPhysicalDevicePCIBusInfoPropertiesEXT *)pnext);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES:
vn_decode_VkPhysicalDeviceProperties2_pnext(dec, pnext->pNext);
vn_decode_VkPhysicalDeviceDepthStencilResolveProperties_self(dec, (VkPhysicalDeviceDepthStencilResolveProperties *)pnext);
@@ -16785,6 +16917,14 @@ vn_sizeof_VkPhysicalDeviceProperties2_pnext_partial(const void *val)
size += vn_sizeof_VkPhysicalDeviceProperties2_pnext_partial(pnext->pNext);
size += vn_sizeof_VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT_self_partial((const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *)pnext);
return size;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT:
if (!vn_cs_renderer_protocol_has_extension(213 /* VK_EXT_pci_bus_info */))
break;
size += vn_sizeof_simple_pointer(pnext);
size += vn_sizeof_VkStructureType(&pnext->sType);
size += vn_sizeof_VkPhysicalDeviceProperties2_pnext_partial(pnext->pNext);
size += vn_sizeof_VkPhysicalDevicePCIBusInfoPropertiesEXT_self_partial((const VkPhysicalDevicePCIBusInfoPropertiesEXT *)pnext);
return size;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES:
size += vn_sizeof_simple_pointer(pnext);
size += vn_sizeof_VkStructureType(&pnext->sType);
@@ -17027,6 +17167,14 @@ vn_encode_VkPhysicalDeviceProperties2_pnext_partial(struct vn_cs_encoder *enc, c
vn_encode_VkPhysicalDeviceProperties2_pnext_partial(enc, pnext->pNext);
vn_encode_VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT_self_partial(enc, (const VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *)pnext);
return;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT:
if (!vn_cs_renderer_protocol_has_extension(213 /* VK_EXT_pci_bus_info */))
break;
vn_encode_simple_pointer(enc, pnext);
vn_encode_VkStructureType(enc, &pnext->sType);
vn_encode_VkPhysicalDeviceProperties2_pnext_partial(enc, pnext->pNext);
vn_encode_VkPhysicalDevicePCIBusInfoPropertiesEXT_self_partial(enc, (const VkPhysicalDevicePCIBusInfoPropertiesEXT *)pnext);
return;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES:
vn_encode_simple_pointer(enc, pnext);
vn_encode_VkStructureType(enc, &pnext->sType);
@@ -17265,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;
/* WA1: size += vn_sizeof_uint32_t(&val->drmFormatModifierCount); */(void)0;
if (val->pDrmFormatModifierProperties) {
size += vn_sizeof_array_size(val->drmFormatModifierCount);
for (uint32_t i = 0; i < val->drmFormatModifierCount; i++)
@@ -17299,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;
/* WA1: vn_encode_uint32_t(enc, &val->drmFormatModifierCount); */(void)0;
if (val->pDrmFormatModifierProperties) {
vn_encode_array_size(enc, val->drmFormatModifierCount);
for (uint32_t i = 0; i < val->drmFormatModifierCount; i++)
@@ -17556,7 +17704,7 @@ vn_sizeof_VkDrmFormatModifierPropertiesList2EXT_self_partial(const VkDrmFormatMo
{
size_t size = 0;
/* skip val->{sType,pNext} */
/* WA1: size += vn_sizeof_uint32_t(&val->drmFormatModifierCount) */(void)0;
/* WA1: size += vn_sizeof_uint32_t(&val->drmFormatModifierCount); */(void)0;
if (val->pDrmFormatModifierProperties) {
size += vn_sizeof_array_size(val->drmFormatModifierCount);
for (uint32_t i = 0; i < val->drmFormatModifierCount; i++)
@@ -17590,7 +17738,7 @@ static inline void
vn_encode_VkDrmFormatModifierPropertiesList2EXT_self_partial(struct vn_cs_encoder *enc, const VkDrmFormatModifierPropertiesList2EXT *val)
{
/* skip val->{sType,pNext} */
/* WA1: vn_encode_uint32_t(enc, &val->drmFormatModifierCount) */(void)0;
/* WA1: vn_encode_uint32_t(enc, &val->drmFormatModifierCount); */(void)0;
if (val->pDrmFormatModifierProperties) {
vn_encode_array_size(enc, val->drmFormatModifierCount);
for (uint32_t i = 0; i < val->drmFormatModifierCount; i++)
src/virtio/venus-protocol/vn_protocol_driver_info.h
+3 -2
View File
@@ -19,8 +19,8 @@ struct vn_info_extension {
};
/* sorted by extension names for bsearch */
static const uint32_t _vn_info_extension_count = 98;
static const struct vn_info_extension _vn_info_extensions[98] = {
static const uint32_t _vn_info_extension_count = 99;
static const struct vn_info_extension _vn_info_extensions[99] = {
{ "VK_EXT_4444_formats", 341, 1 },
{ "VK_EXT_calibrated_timestamps", 185, 2 },
{ "VK_EXT_command_serialization", 384, 0 },
@@ -42,6 +42,7 @@ static const struct vn_info_extension _vn_info_extensions[98] = {
{ "VK_EXT_line_rasterization", 260, 1 },
{ "VK_EXT_multi_draw", 393, 1 },
{ "VK_EXT_mutable_descriptor_type", 495, 1 },
{ "VK_EXT_pci_bus_info", 213, 2 },
{ "VK_EXT_pipeline_creation_cache_control", 298, 3 },
{ "VK_EXT_pipeline_creation_feedback", 193, 1 },
{ "VK_EXT_primitive_topology_list_restart", 357, 1 },
src/virtio/venus-protocol/vn_protocol_driver_structs.h
+6 -6
View File
@@ -800,15 +800,15 @@ vn_sizeof_VkClearColorValue_tag(const VkClearColorValue *val, uint32_t tag)
switch (tag) {
case 0:
size += vn_sizeof_array_size(4);
size += vn_sizeof_float_array(val->float32, 4);
size += vn_sizeof_float_array(val->float32, 4);
break;
case 1:
size += vn_sizeof_array_size(4);
size += vn_sizeof_int32_t_array(val->int32, 4);
size += vn_sizeof_int32_t_array(val->int32, 4);
break;
case 2:
size += vn_sizeof_array_size(4);
size += vn_sizeof_uint32_t_array(val->uint32, 4);
size += vn_sizeof_uint32_t_array(val->uint32, 4);
break;
default:
assert(false);
@@ -830,15 +830,15 @@ vn_encode_VkClearColorValue_tag(struct vn_cs_encoder *enc, const VkClearColorVal
switch (tag) {
case 0:
vn_encode_array_size(enc, 4);
vn_encode_float_array(enc, val->float32, 4);
vn_encode_float_array(enc, val->float32, 4);
break;
case 1:
vn_encode_array_size(enc, 4);
vn_encode_int32_t_array(enc, val->int32, 4);
vn_encode_int32_t_array(enc, val->int32, 4);
break;
case 2:
vn_encode_array_size(enc, 4);
vn_encode_uint32_t_array(enc, val->uint32, 4);
vn_encode_uint32_t_array(enc, val->uint32, 4);
break;
default:
assert(false);