fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

venus: update venus-protocol for external memory

Browse source 
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10437>
This commit is contained in:
Chia-I Wu 2021-04-20 17:27:46 -07:00
parent 88f481dd74
commit fbaa6dbf4e
5 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/virtio/venus-protocol/vn_protocol_driver.h
View file

@ -1,4 +1,4 @@
/* This file is generated by venus-protocol git-62efb3c8. */
/* This file is generated by venus-protocol git-3f14eafb. */
/*
* Copyright 2020 Google LLC

2
src/virtio/venus-protocol/vn_protocol_driver_defines.h
View file

@ -248,6 +248,8 @@ typedef enum VkCommandTypeEXT {
VK_COMMAND_TYPE_vkCmdBeginQueryIndexedEXT_EXT = 184,
VK_COMMAND_TYPE_vkCmdEndQueryIndexedEXT_EXT = 185,
VK_COMMAND_TYPE_vkCmdDrawIndirectByteCountEXT_EXT = 186,
VK_COMMAND_TYPE_vkGetMemoryFdKHR_EXT = 193,
VK_COMMAND_TYPE_vkGetMemoryFdPropertiesKHR_EXT = 194,
VK_COMMAND_TYPE_vkGetImageDrmFormatModifierPropertiesEXT_EXT = 187,
VK_COMMAND_TYPE_vkSetReplyCommandStreamMESA_EXT = 178,
VK_COMMAND_TYPE_vkSeekReplyCommandStreamMESA_EXT = 179,

3
src/virtio/venus-protocol/vn_protocol_driver_device_memory.h
View file

@ -14,6 +14,7 @@
/*
* These structs/unions/commands are not included
*
* VkImportMemoryFdInfoKHR
* vkMapMemory
*/
@ -326,6 +327,7 @@ vn_sizeof_VkMemoryAllocateInfo_pnext(const void *val)
size += vn_sizeof_VkMemoryAllocateInfo_pnext(pnext->pNext);
size += vn_sizeof_VkImportMemoryResourceInfoMESA_self((const VkImportMemoryResourceInfoMESA *)pnext);
return size;
case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR:
default:
/* ignore unknown/unsupported struct */
break;
@ -395,6 +397,7 @@ vn_encode_VkMemoryAllocateInfo_pnext(struct vn_cs_encoder *enc, const void *val)
vn_encode_VkMemoryAllocateInfo_pnext(enc, pnext->pNext);
vn_encode_VkImportMemoryResourceInfoMESA_self(enc, (const VkImportMemoryResourceInfoMESA *)pnext);
return;
case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR:
default:
/* ignore unknown/unsupported struct */
break;

10
src/virtio/venus-protocol/vn_protocol_driver_info.h
View file

@ -31,10 +31,11 @@ vn_info_extension_compare(const void *a, const void *b)
static inline uint32_t
vn_info_extension_spec_version(const char *name)
{
static uint32_t ext_count = 51;
static const char *ext_names[51] = {
static uint32_t ext_count = 53;
static const char *ext_names[53] = {
"VK_EXT_command_serialization",
"VK_EXT_descriptor_indexing",
"VK_EXT_external_memory_dma_buf",
"VK_EXT_host_query_reset",
"VK_EXT_image_drm_format_modifier",
"VK_EXT_sampler_filter_minmax",
@ -58,6 +59,7 @@ vn_info_extension_spec_version(const char *name)
"VK_KHR_external_fence_capabilities",
"VK_KHR_external_memory",
"VK_KHR_external_memory_capabilities",
"VK_KHR_external_memory_fd",
"VK_KHR_external_semaphore",
"VK_KHR_external_semaphore_capabilities",
"VK_KHR_get_memory_requirements2",
@ -85,11 +87,12 @@ vn_info_extension_spec_version(const char *name)
"VK_KHR_vulkan_memory_model",
"VK_MESA_venus_protocol",
};
static const uint32_t ext_versions[51] = {
static const uint32_t ext_versions[53] = {
0,
2,
1,
1,
1,
2,
1,
1,
@ -114,6 +117,7 @@ vn_info_extension_spec_version(const char *name)
1,
1,
1,
1,
2,
1,
1,

7
src/virtio/venus-protocol/vn_protocol_driver_transport.h
View file

@ -11,6 +11,13 @@
#include "vn_device.h"
#include "vn_protocol_driver_structs.h"
/*
* These structs/unions/commands are not included
*
* vkGetMemoryFdKHR
* vkGetMemoryFdPropertiesKHR
*/
/* struct VkCommandStreamDescriptionMESA */
static inline size_t