fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

venus: sync protocol to v1.3.302

Browse source 
and update extensions being promoted

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33561>
This commit is contained in:
Yiwei Zhang 2025-02-14 16:39:02 -08:00 • committed by Marge Bot
parent 2026e4a262
commit 5603b78779
10 changed files with 511 additions and 342 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-5cb1399b. */
/* This file is generated by venus-protocol git-f770d7df. */
/*
* Copyright 2020 Google LLC

56
src/virtio/venus-protocol/vn_protocol_driver_command_buffer.h
View file

@ -3026,7 +3026,7 @@ vn_sizeof_VkRenderingInfo_pnext(const void *val)
size += vn_sizeof_VkDeviceGroupRenderPassBeginInfo_self((const VkDeviceGroupRenderPassBeginInfo *)pnext);
return size;
case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
if (!(vn_cs_renderer_protocol_has_extension(45 /* VK_KHR_dynamic_rendering */) && vn_cs_renderer_protocol_has_extension(227 /* VK_KHR_fragment_shading_rate */)))
if (!(vn_cs_renderer_protocol_has_extension(227 /* VK_KHR_fragment_shading_rate */) && vn_cs_renderer_protocol_has_extension(45 /* VK_KHR_dynamic_rendering */)))
break;
size += vn_sizeof_simple_pointer(pnext);
size += vn_sizeof_VkStructureType(&pnext->sType);
@ -3095,7 +3095,7 @@ vn_encode_VkRenderingInfo_pnext(struct vn_cs_encoder *enc, const void *val)
vn_encode_VkDeviceGroupRenderPassBeginInfo_self(enc, (const VkDeviceGroupRenderPassBeginInfo *)pnext);
return;
case VK_STRUCTURE_TYPE_RENDERING_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR:
if (!(vn_cs_renderer_protocol_has_extension(45 /* VK_KHR_dynamic_rendering */) && vn_cs_renderer_protocol_has_extension(227 /* VK_KHR_fragment_shading_rate */)))
if (!(vn_cs_renderer_protocol_has_extension(227 /* VK_KHR_fragment_shading_rate */) && vn_cs_renderer_protocol_has_extension(45 /* VK_KHR_dynamic_rendering */)))
break;
vn_encode_simple_pointer(enc, pnext);
vn_encode_VkStructureType(enc, &pnext->sType);
@ -7335,9 +7335,9 @@ static inline void vn_decode_vkCmdDrawIndirectByteCountEXT_reply(struct vn_cs_de
/* skip vertexStride */
}
static inline size_t vn_sizeof_vkCmdSetLineStippleEXT(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
static inline size_t vn_sizeof_vkCmdSetLineStippleKHR(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
{
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineStippleEXT_EXT;
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineStippleKHR_EXT;
const VkFlags cmd_flags = 0;
size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type) + vn_sizeof_VkFlags(&cmd_flags);
@ -7348,9 +7348,9 @@ static inline size_t vn_sizeof_vkCmdSetLineStippleEXT(VkCommandBuffer commandBuf
return cmd_size;
}
static inline void vn_encode_vkCmdSetLineStippleEXT(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
static inline void vn_encode_vkCmdSetLineStippleKHR(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
{
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineStippleEXT_EXT;
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineStippleKHR_EXT;
vn_encode_VkCommandTypeEXT(enc, &cmd_type);
vn_encode_VkFlags(enc, &cmd_flags);
@ -7360,9 +7360,9 @@ static inline void vn_encode_vkCmdSetLineStippleEXT(struct vn_cs_encoder *enc, V
vn_encode_uint16_t(enc, &lineStipplePattern);
}
static inline size_t vn_sizeof_vkCmdSetLineStippleEXT_reply(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
static inline size_t vn_sizeof_vkCmdSetLineStippleKHR_reply(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
{
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineStippleEXT_EXT;
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineStippleKHR_EXT;
size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type);
/* skip commandBuffer */
@ -7372,11 +7372,11 @@ static inline size_t vn_sizeof_vkCmdSetLineStippleEXT_reply(VkCommandBuffer comm
return cmd_size;
}
static inline void vn_decode_vkCmdSetLineStippleEXT_reply(struct vn_cs_decoder *dec, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
static inline void vn_decode_vkCmdSetLineStippleKHR_reply(struct vn_cs_decoder *dec, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
{
VkCommandTypeEXT command_type;
vn_decode_VkCommandTypeEXT(dec, &command_type);
assert(command_type == VK_COMMAND_TYPE_vkCmdSetLineStippleEXT_EXT);
assert(command_type == VK_COMMAND_TYPE_vkCmdSetLineStippleKHR_EXT);
/* skip commandBuffer */
/* skip lineStippleFactor */
@ -9181,19 +9181,19 @@ static inline void vn_decode_vkCmdSetProvokingVertexModeEXT_reply(struct vn_cs_d
/* skip provokingVertexMode */
}
static inline size_t vn_sizeof_vkCmdSetLineRasterizationModeEXT(VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode)
static inline size_t vn_sizeof_vkCmdSetLineRasterizationModeEXT(VkCommandBuffer commandBuffer, VkLineRasterizationModeKHR lineRasterizationMode)
{
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineRasterizationModeEXT_EXT;
const VkFlags cmd_flags = 0;
size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type) + vn_sizeof_VkFlags(&cmd_flags);
cmd_size += vn_sizeof_VkCommandBuffer(&commandBuffer);
cmd_size += vn_sizeof_VkLineRasterizationModeEXT(&lineRasterizationMode);
cmd_size += vn_sizeof_VkLineRasterizationModeKHR(&lineRasterizationMode);
return cmd_size;
}
static inline void vn_encode_vkCmdSetLineRasterizationModeEXT(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode)
static inline void vn_encode_vkCmdSetLineRasterizationModeEXT(struct vn_cs_encoder *enc, VkCommandFlagsEXT cmd_flags, VkCommandBuffer commandBuffer, VkLineRasterizationModeKHR lineRasterizationMode)
{
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineRasterizationModeEXT_EXT;
@ -9201,10 +9201,10 @@ static inline void vn_encode_vkCmdSetLineRasterizationModeEXT(struct vn_cs_encod
vn_encode_VkFlags(enc, &cmd_flags);
vn_encode_VkCommandBuffer(enc, &commandBuffer);
vn_encode_VkLineRasterizationModeEXT(enc, &lineRasterizationMode);
vn_encode_VkLineRasterizationModeKHR(enc, &lineRasterizationMode);
}
static inline size_t vn_sizeof_vkCmdSetLineRasterizationModeEXT_reply(VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode)
static inline size_t vn_sizeof_vkCmdSetLineRasterizationModeEXT_reply(VkCommandBuffer commandBuffer, VkLineRasterizationModeKHR lineRasterizationMode)
{
const VkCommandTypeEXT cmd_type = VK_COMMAND_TYPE_vkCmdSetLineRasterizationModeEXT_EXT;
size_t cmd_size = vn_sizeof_VkCommandTypeEXT(&cmd_type);
@ -9215,7 +9215,7 @@ static inline size_t vn_sizeof_vkCmdSetLineRasterizationModeEXT_reply(VkCommandB
return cmd_size;
}
static inline void vn_decode_vkCmdSetLineRasterizationModeEXT_reply(struct vn_cs_decoder *dec, VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode)
static inline void vn_decode_vkCmdSetLineRasterizationModeEXT_reply(struct vn_cs_decoder *dec, VkCommandBuffer commandBuffer, VkLineRasterizationModeKHR lineRasterizationMode)
{
VkCommandTypeEXT command_type;
vn_decode_VkCommandTypeEXT(dec, &command_type);
@ -11575,21 +11575,21 @@ static inline void vn_submit_vkCmdDrawIndirectByteCountEXT(struct vn_ring *vn_ri
}
}
static inline void vn_submit_vkCmdSetLineStippleEXT(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern, struct vn_ring_submit_command *submit)
static inline void vn_submit_vkCmdSetLineStippleKHR(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern, struct vn_ring_submit_command *submit)
{
uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE];
void *cmd_data = local_cmd_data;
size_t cmd_size = vn_sizeof_vkCmdSetLineStippleEXT(commandBuffer, lineStippleFactor, lineStipplePattern);
size_t cmd_size = vn_sizeof_vkCmdSetLineStippleKHR(commandBuffer, lineStippleFactor, lineStipplePattern);
if (cmd_size > sizeof(local_cmd_data)) {
cmd_data = malloc(cmd_size);
if (!cmd_data)
cmd_size = 0;
}
const size_t reply_size = cmd_flags & VK_COMMAND_GENERATE_REPLY_BIT_EXT ? vn_sizeof_vkCmdSetLineStippleEXT_reply(commandBuffer, lineStippleFactor, lineStipplePattern) : 0;
const size_t reply_size = cmd_flags & VK_COMMAND_GENERATE_REPLY_BIT_EXT ? vn_sizeof_vkCmdSetLineStippleKHR_reply(commandBuffer, lineStippleFactor, lineStipplePattern) : 0;
struct vn_cs_encoder *enc = vn_ring_submit_command_init(vn_ring, submit, cmd_data, cmd_size, reply_size);
if (cmd_size) {
vn_encode_vkCmdSetLineStippleEXT(enc, cmd_flags, commandBuffer, lineStippleFactor, lineStipplePattern);
vn_encode_vkCmdSetLineStippleKHR(enc, cmd_flags, commandBuffer, lineStippleFactor, lineStipplePattern);
vn_ring_submit_command(vn_ring, submit);
if (cmd_data != local_cmd_data)
free(cmd_data);
@ -12352,7 +12352,7 @@ static inline void vn_submit_vkCmdSetProvokingVertexModeEXT(struct vn_ring *vn_r
}
}
static inline void vn_submit_vkCmdSetLineRasterizationModeEXT(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode, struct vn_ring_submit_command *submit)
static inline void vn_submit_vkCmdSetLineRasterizationModeEXT(struct vn_ring *vn_ring, VkCommandFlagsEXT cmd_flags, VkCommandBuffer commandBuffer, VkLineRasterizationModeKHR lineRasterizationMode, struct vn_ring_submit_command *submit)
{
uint8_t local_cmd_data[VN_SUBMIT_LOCAL_CMD_SIZE];
void *cmd_data = local_cmd_data;
@ -14055,23 +14055,23 @@ static inline void vn_async_vkCmdDrawIndirectByteCountEXT(struct vn_ring *vn_rin
vn_submit_vkCmdDrawIndirectByteCountEXT(vn_ring, 0, commandBuffer, instanceCount, firstInstance, counterBuffer, counterBufferOffset, counterOffset, vertexStride, &submit);
}
static inline void vn_call_vkCmdSetLineStippleEXT(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
static inline void vn_call_vkCmdSetLineStippleKHR(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
{
VN_TRACE_FUNC();
struct vn_ring_submit_command submit;
vn_submit_vkCmdSetLineStippleEXT(vn_ring, VK_COMMAND_GENERATE_REPLY_BIT_EXT, commandBuffer, lineStippleFactor, lineStipplePattern, &submit);
vn_submit_vkCmdSetLineStippleKHR(vn_ring, VK_COMMAND_GENERATE_REPLY_BIT_EXT, commandBuffer, lineStippleFactor, lineStipplePattern, &submit);
struct vn_cs_decoder *dec = vn_ring_get_command_reply(vn_ring, &submit);
if (dec) {
vn_decode_vkCmdSetLineStippleEXT_reply(dec, commandBuffer, lineStippleFactor, lineStipplePattern);
vn_decode_vkCmdSetLineStippleKHR_reply(dec, commandBuffer, lineStippleFactor, lineStipplePattern);
vn_ring_free_command_reply(vn_ring, &submit);
}
}
static inline void vn_async_vkCmdSetLineStippleEXT(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
static inline void vn_async_vkCmdSetLineStippleKHR(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern)
{
struct vn_ring_submit_command submit;
vn_submit_vkCmdSetLineStippleEXT(vn_ring, 0, commandBuffer, lineStippleFactor, lineStipplePattern, &submit);
vn_submit_vkCmdSetLineStippleKHR(vn_ring, 0, commandBuffer, lineStippleFactor, lineStipplePattern, &submit);
}
static inline void vn_call_vkCmdSetCullMode(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, VkCullModeFlags cullMode)
@ -14758,7 +14758,7 @@ static inline void vn_async_vkCmdSetProvokingVertexModeEXT(struct vn_ring *vn_ri
vn_submit_vkCmdSetProvokingVertexModeEXT(vn_ring, 0, commandBuffer, provokingVertexMode, &submit);
}
static inline void vn_call_vkCmdSetLineRasterizationModeEXT(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode)
static inline void vn_call_vkCmdSetLineRasterizationModeEXT(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, VkLineRasterizationModeKHR lineRasterizationMode)
{
VN_TRACE_FUNC();
@ -14771,7 +14771,7 @@ static inline void vn_call_vkCmdSetLineRasterizationModeEXT(struct vn_ring *vn_r
}
}
static inline void vn_async_vkCmdSetLineRasterizationModeEXT(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, VkLineRasterizationModeEXT lineRasterizationMode)
static inline void vn_async_vkCmdSetLineRasterizationModeEXT(struct vn_ring *vn_ring, VkCommandBuffer commandBuffer, VkLineRasterizationModeKHR lineRasterizationMode)
{
struct vn_ring_submit_command submit;
vn_submit_vkCmdSetLineRasterizationModeEXT(vn_ring, 0, commandBuffer, lineRasterizationMode, &submit);

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

@ -338,10 +338,13 @@ typedef enum VkCommandTypeEXT {
VK_COMMAND_TYPE_vkCmdSetSampleLocationsEXT_EXT = 283,
VK_COMMAND_TYPE_vkGetPhysicalDeviceMultisamplePropertiesEXT_EXT = 284,
VK_COMMAND_TYPE_vkGetImageDrmFormatModifierPropertiesEXT_EXT = 187,
VK_COMMAND_TYPE_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR_EXT = 235,
VK_COMMAND_TYPE_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_EXT = 235,
VK_COMMAND_TYPE_vkGetCalibratedTimestampsKHR_EXT = 236,
VK_COMMAND_TYPE_vkGetCalibratedTimestampsEXT_EXT = 236,
VK_COMMAND_TYPE_vkGetPhysicalDeviceFragmentShadingRatesKHR_EXT = 277,
VK_COMMAND_TYPE_vkCmdSetFragmentShadingRateKHR_EXT = 278,
VK_COMMAND_TYPE_vkCmdSetLineStippleKHR_EXT = 237,
VK_COMMAND_TYPE_vkCmdSetLineStippleEXT_EXT = 237,
VK_COMMAND_TYPE_vkCmdSetVertexInputEXT_EXT = 255,
VK_COMMAND_TYPE_vkCmdSetPatchControlPointsEXT_EXT = 233,
@ -349,7 +352,6 @@ typedef enum VkCommandTypeEXT {
VK_COMMAND_TYPE_vkCmdSetColorWriteEnableEXT_EXT = 254,
VK_COMMAND_TYPE_vkCmdDrawMultiEXT_EXT = 247,
VK_COMMAND_TYPE_vkCmdDrawMultiIndexedEXT_EXT = 248,
VK_COMMAND_TYPE_vkCmdSetTessellationDomainOriginEXT_EXT = 256,
VK_COMMAND_TYPE_vkCmdSetDepthClampEnableEXT_EXT = 257,
VK_COMMAND_TYPE_vkCmdSetPolygonModeEXT_EXT = 258,
VK_COMMAND_TYPE_vkCmdSetRasterizationSamplesEXT_EXT = 259,
@ -360,6 +362,7 @@ typedef enum VkCommandTypeEXT {
VK_COMMAND_TYPE_vkCmdSetColorBlendEnableEXT_EXT = 264,
VK_COMMAND_TYPE_vkCmdSetColorBlendEquationEXT_EXT = 265,
VK_COMMAND_TYPE_vkCmdSetColorWriteMaskEXT_EXT = 266,
VK_COMMAND_TYPE_vkCmdSetTessellationDomainOriginEXT_EXT = 256,
VK_COMMAND_TYPE_vkCmdSetRasterizationStreamEXT_EXT = 267,
VK_COMMAND_TYPE_vkCmdSetConservativeRasterizationModeEXT_EXT = 268,
VK_COMMAND_TYPE_vkCmdSetExtraPrimitiveOverestimationSizeEXT_EXT = 269,

622
src/virtio/venus-protocol/vn_protocol_driver_device.h
View file

File diff suppressed because it is too large Load diff

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

@ -10,7 +10,7 @@
#include "vn_protocol_driver_defines.h"
#define VN_INFO_EXTENSION_MAX_NUMBER (500)
#define VN_INFO_EXTENSION_MAX_NUMBER (544)
struct vn_info_extension {
const char *name;
@ -19,8 +19,8 @@ struct vn_info_extension {
};
/* sorted by extension names for bsearch */
static const uint32_t _vn_info_extension_count = 120;
static const struct vn_info_extension _vn_info_extensions[120] = {
static const uint32_t _vn_info_extension_count = 125;
static const struct vn_info_extension _vn_info_extensions[125] = {
{ "VK_EXT_4444_formats", 341, 1 },
{ "VK_EXT_attachment_feedback_loop_layout", 340, 2 },
{ "VK_EXT_blend_operation_advanced", 149, 2 },
@ -85,6 +85,7 @@ static const struct vn_info_extension _vn_info_extensions[120] = {
{ "VK_KHR_8bit_storage", 178, 1 },
{ "VK_KHR_bind_memory2", 158, 1 },
{ "VK_KHR_buffer_device_address", 258, 1 },
{ "VK_KHR_calibrated_timestamps", 544, 1 },
{ "VK_KHR_copy_commands2", 338, 1 },
{ "VK_KHR_create_renderpass2", 110, 1 },
{ "VK_KHR_dedicated_allocation", 128, 3 },
@ -110,6 +111,9 @@ static const struct vn_info_extension _vn_info_extensions[120] = {
{ "VK_KHR_get_physical_device_properties2", 60, 2 },
{ "VK_KHR_image_format_list", 148, 1 },
{ "VK_KHR_imageless_framebuffer", 109, 1 },
{ "VK_KHR_index_type_uint8", 534, 1 },
{ "VK_KHR_line_rasterization", 535, 1 },
{ "VK_KHR_load_store_op_none", 527, 1 },
{ "VK_KHR_maintenance1", 70, 2 },
{ "VK_KHR_maintenance2", 118, 1 },
{ "VK_KHR_maintenance3", 169, 1 },
@ -137,6 +141,7 @@ static const struct vn_info_extension _vn_info_extensions[120] = {
{ "VK_KHR_timeline_semaphore", 208, 2 },
{ "VK_KHR_uniform_buffer_standard_layout", 254, 1 },
{ "VK_KHR_variable_pointers", 121, 1 },
{ "VK_KHR_vertex_attribute_divisor", 526, 1 },
{ "VK_KHR_vulkan_memory_model", 212, 3 },
{ "VK_KHR_zero_initialize_workgroup_memory", 326, 1 },
{ "VK_MESA_venus_protocol", 385, 2 },
@ -152,7 +157,7 @@ vn_info_wire_format_version(void)
static inline uint32_t
vn_info_vk_xml_version(void)
{
return VK_MAKE_API_VERSION(0, 1, 3, 269);
return VK_MAKE_API_VERSION(0, 1, 3, 302);
}
static inline int

90
src/virtio/venus-protocol/vn_protocol_driver_pipeline.h
View file

@ -295,10 +295,10 @@ vn_encode_VkVertexInputAttributeDescription(struct vn_cs_encoder *enc, const VkV
vn_encode_uint32_t(enc, &val->offset);
}
/* struct VkVertexInputBindingDivisorDescriptionEXT */
/* struct VkVertexInputBindingDivisorDescriptionKHR */
static inline size_t
vn_sizeof_VkVertexInputBindingDivisorDescriptionEXT(const VkVertexInputBindingDivisorDescriptionEXT *val)
vn_sizeof_VkVertexInputBindingDivisorDescriptionKHR(const VkVertexInputBindingDivisorDescriptionKHR *val)
{
size_t size = 0;
size += vn_sizeof_uint32_t(&val->binding);
@ -307,23 +307,23 @@ vn_sizeof_VkVertexInputBindingDivisorDescriptionEXT(const VkVertexInputBindingDi
}
static inline void
vn_encode_VkVertexInputBindingDivisorDescriptionEXT(struct vn_cs_encoder *enc, const VkVertexInputBindingDivisorDescriptionEXT *val)
vn_encode_VkVertexInputBindingDivisorDescriptionKHR(struct vn_cs_encoder *enc, const VkVertexInputBindingDivisorDescriptionKHR *val)
{
vn_encode_uint32_t(enc, &val->binding);
vn_encode_uint32_t(enc, &val->divisor);
}
/* struct VkPipelineVertexInputDivisorStateCreateInfoEXT chain */
/* struct VkPipelineVertexInputDivisorStateCreateInfoKHR chain */
static inline size_t
vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoEXT_pnext(const void *val)
vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoKHR_pnext(const void *val)
{
/* no known/supported struct */
return vn_sizeof_simple_pointer(NULL);
}
static inline size_t
vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoEXT_self(const VkPipelineVertexInputDivisorStateCreateInfoEXT *val)
vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoKHR_self(const VkPipelineVertexInputDivisorStateCreateInfoKHR *val)
{
size_t size = 0;
/* skip val->{sType,pNext} */
@ -331,7 +331,7 @@ vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoEXT_self(const VkPipelineVe
if (val->pVertexBindingDivisors) {
size += vn_sizeof_array_size(val->vertexBindingDivisorCount);
for (uint32_t i = 0; i < val->vertexBindingDivisorCount; i++)
size += vn_sizeof_VkVertexInputBindingDivisorDescriptionEXT(&val->pVertexBindingDivisors[i]);
size += vn_sizeof_VkVertexInputBindingDivisorDescriptionKHR(&val->pVertexBindingDivisors[i]);
} else {
size += vn_sizeof_array_size(0);
}
@ -339,45 +339,45 @@ vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoEXT_self(const VkPipelineVe
}
static inline size_t
vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoEXT(const VkPipelineVertexInputDivisorStateCreateInfoEXT *val)
vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoKHR(const VkPipelineVertexInputDivisorStateCreateInfoKHR *val)
{
size_t size = 0;
size += vn_sizeof_VkStructureType(&val->sType);
size += vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoEXT_pnext(val->pNext);
size += vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoEXT_self(val);
size += vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoKHR_pnext(val->pNext);
size += vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoKHR_self(val);
return size;
}
static inline void
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoEXT_pnext(struct vn_cs_encoder *enc, const void *val)
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoKHR_pnext(struct vn_cs_encoder *enc, const void *val)
{
/* no known/supported struct */
vn_encode_simple_pointer(enc, NULL);
}
static inline void
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoEXT_self(struct vn_cs_encoder *enc, const VkPipelineVertexInputDivisorStateCreateInfoEXT *val)
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoKHR_self(struct vn_cs_encoder *enc, const VkPipelineVertexInputDivisorStateCreateInfoKHR *val)
{
/* skip val->{sType,pNext} */
vn_encode_uint32_t(enc, &val->vertexBindingDivisorCount);
if (val->pVertexBindingDivisors) {
vn_encode_array_size(enc, val->vertexBindingDivisorCount);
for (uint32_t i = 0; i < val->vertexBindingDivisorCount; i++)
vn_encode_VkVertexInputBindingDivisorDescriptionEXT(enc, &val->pVertexBindingDivisors[i]);
vn_encode_VkVertexInputBindingDivisorDescriptionKHR(enc, &val->pVertexBindingDivisors[i]);
} else {
vn_encode_array_size(enc, 0);
}
}
static inline void
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoEXT(struct vn_cs_encoder *enc, const VkPipelineVertexInputDivisorStateCreateInfoEXT *val)
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoKHR(struct vn_cs_encoder *enc, const VkPipelineVertexInputDivisorStateCreateInfoKHR *val)
{
assert(val->sType == VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT);
vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT });
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoEXT_pnext(enc, val->pNext);
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoEXT_self(enc, val);
assert(val->sType == VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR);
vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR });
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoKHR_pnext(enc, val->pNext);
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoKHR_self(enc, val);
}
/* struct VkPipelineVertexInputStateCreateInfo chain */
@ -390,13 +390,13 @@ vn_sizeof_VkPipelineVertexInputStateCreateInfo_pnext(const void *val)
while (pnext) {
switch ((int32_t)pnext->sType) {
case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT:
if (!vn_cs_renderer_protocol_has_extension(191 /* VK_EXT_vertex_attribute_divisor */))
case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR:
if (!vn_cs_renderer_protocol_has_extension(191 /* VK_EXT_vertex_attribute_divisor */) && !vn_cs_renderer_protocol_has_extension(526 /* VK_KHR_vertex_attribute_divisor */))
break;
size += vn_sizeof_simple_pointer(pnext);
size += vn_sizeof_VkStructureType(&pnext->sType);
size += vn_sizeof_VkPipelineVertexInputStateCreateInfo_pnext(pnext->pNext);
size += vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoEXT_self((const VkPipelineVertexInputDivisorStateCreateInfoEXT *)pnext);
size += vn_sizeof_VkPipelineVertexInputDivisorStateCreateInfoKHR_self((const VkPipelineVertexInputDivisorStateCreateInfoKHR *)pnext);
return size;
default:
/* ignore unknown/unsupported struct */
@ -452,13 +452,13 @@ vn_encode_VkPipelineVertexInputStateCreateInfo_pnext(struct vn_cs_encoder *enc,
while (pnext) {
switch ((int32_t)pnext->sType) {
case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT:
if (!vn_cs_renderer_protocol_has_extension(191 /* VK_EXT_vertex_attribute_divisor */))
case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR:
if (!vn_cs_renderer_protocol_has_extension(191 /* VK_EXT_vertex_attribute_divisor */) && !vn_cs_renderer_protocol_has_extension(526 /* VK_KHR_vertex_attribute_divisor */))
break;
vn_encode_simple_pointer(enc, pnext);
vn_encode_VkStructureType(enc, &pnext->sType);
vn_encode_VkPipelineVertexInputStateCreateInfo_pnext(enc, pnext->pNext);
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoEXT_self(enc, (const VkPipelineVertexInputDivisorStateCreateInfoEXT *)pnext);
vn_encode_VkPipelineVertexInputDivisorStateCreateInfoKHR_self(enc, (const VkPipelineVertexInputDivisorStateCreateInfoKHR *)pnext);
return;
default:
/* ignore unknown/unsupported struct */
@ -1042,21 +1042,21 @@ vn_encode_VkPipelineRasterizationDepthClipStateCreateInfoEXT(struct vn_cs_encode
vn_encode_VkPipelineRasterizationDepthClipStateCreateInfoEXT_self(enc, val);
}
/* struct VkPipelineRasterizationLineStateCreateInfoEXT chain */
/* struct VkPipelineRasterizationLineStateCreateInfoKHR chain */
static inline size_t
vn_sizeof_VkPipelineRasterizationLineStateCreateInfoEXT_pnext(const void *val)
vn_sizeof_VkPipelineRasterizationLineStateCreateInfoKHR_pnext(const void *val)
{
/* no known/supported struct */
return vn_sizeof_simple_pointer(NULL);
}
static inline size_t
vn_sizeof_VkPipelineRasterizationLineStateCreateInfoEXT_self(const VkPipelineRasterizationLineStateCreateInfoEXT *val)
vn_sizeof_VkPipelineRasterizationLineStateCreateInfoKHR_self(const VkPipelineRasterizationLineStateCreateInfoKHR *val)
{
size_t size = 0;
/* skip val->{sType,pNext} */
size += vn_sizeof_VkLineRasterizationModeEXT(&val->lineRasterizationMode);
size += vn_sizeof_VkLineRasterizationModeKHR(&val->lineRasterizationMode);
size += vn_sizeof_VkBool32(&val->stippledLineEnable);
size += vn_sizeof_uint32_t(&val->lineStippleFactor);
size += vn_sizeof_uint16_t(&val->lineStipplePattern);
@ -1064,41 +1064,41 @@ vn_sizeof_VkPipelineRasterizationLineStateCreateInfoEXT_self(const VkPipelineRas
}
static inline size_t
vn_sizeof_VkPipelineRasterizationLineStateCreateInfoEXT(const VkPipelineRasterizationLineStateCreateInfoEXT *val)
vn_sizeof_VkPipelineRasterizationLineStateCreateInfoKHR(const VkPipelineRasterizationLineStateCreateInfoKHR *val)
{
size_t size = 0;
size += vn_sizeof_VkStructureType(&val->sType);
size += vn_sizeof_VkPipelineRasterizationLineStateCreateInfoEXT_pnext(val->pNext);
size += vn_sizeof_VkPipelineRasterizationLineStateCreateInfoEXT_self(val);
size += vn_sizeof_VkPipelineRasterizationLineStateCreateInfoKHR_pnext(val->pNext);
size += vn_sizeof_VkPipelineRasterizationLineStateCreateInfoKHR_self(val);
return size;
}
static inline void
vn_encode_VkPipelineRasterizationLineStateCreateInfoEXT_pnext(struct vn_cs_encoder *enc, const void *val)
vn_encode_VkPipelineRasterizationLineStateCreateInfoKHR_pnext(struct vn_cs_encoder *enc, const void *val)
{
/* no known/supported struct */
vn_encode_simple_pointer(enc, NULL);
}
static inline void
vn_encode_VkPipelineRasterizationLineStateCreateInfoEXT_self(struct vn_cs_encoder *enc, const VkPipelineRasterizationLineStateCreateInfoEXT *val)
vn_encode_VkPipelineRasterizationLineStateCreateInfoKHR_self(struct vn_cs_encoder *enc, const VkPipelineRasterizationLineStateCreateInfoKHR *val)
{
/* skip val->{sType,pNext} */
vn_encode_VkLineRasterizationModeEXT(enc, &val->lineRasterizationMode);
vn_encode_VkLineRasterizationModeKHR(enc, &val->lineRasterizationMode);
vn_encode_VkBool32(enc, &val->stippledLineEnable);
vn_encode_uint32_t(enc, &val->lineStippleFactor);
vn_encode_uint16_t(enc, &val->lineStipplePattern);
}
static inline void
vn_encode_VkPipelineRasterizationLineStateCreateInfoEXT(struct vn_cs_encoder *enc, const VkPipelineRasterizationLineStateCreateInfoEXT *val)
vn_encode_VkPipelineRasterizationLineStateCreateInfoKHR(struct vn_cs_encoder *enc, const VkPipelineRasterizationLineStateCreateInfoKHR *val)
{
assert(val->sType == VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT);
vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT });
vn_encode_VkPipelineRasterizationLineStateCreateInfoEXT_pnext(enc, val->pNext);
vn_encode_VkPipelineRasterizationLineStateCreateInfoEXT_self(enc, val);
assert(val->sType == VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR);
vn_encode_VkStructureType(enc, &(VkStructureType){ VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR });
vn_encode_VkPipelineRasterizationLineStateCreateInfoKHR_pnext(enc, val->pNext);
vn_encode_VkPipelineRasterizationLineStateCreateInfoKHR_self(enc, val);
}
/* struct VkPipelineRasterizationProvokingVertexStateCreateInfoEXT chain */
@ -1188,13 +1188,13 @@ vn_sizeof_VkPipelineRasterizationStateCreateInfo_pnext(const void *val)
size += vn_sizeof_VkPipelineRasterizationStateCreateInfo_pnext(pnext->pNext);
size += vn_sizeof_VkPipelineRasterizationDepthClipStateCreateInfoEXT_self((const VkPipelineRasterizationDepthClipStateCreateInfoEXT *)pnext);
return size;
case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT:
if (!vn_cs_renderer_protocol_has_extension(260 /* VK_EXT_line_rasterization */))
case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR:
if (!vn_cs_renderer_protocol_has_extension(260 /* VK_EXT_line_rasterization */) && !vn_cs_renderer_protocol_has_extension(535 /* VK_KHR_line_rasterization */))
break;
size += vn_sizeof_simple_pointer(pnext);
size += vn_sizeof_VkStructureType(&pnext->sType);
size += vn_sizeof_VkPipelineRasterizationStateCreateInfo_pnext(pnext->pNext);
size += vn_sizeof_VkPipelineRasterizationLineStateCreateInfoEXT_self((const VkPipelineRasterizationLineStateCreateInfoEXT *)pnext);
size += vn_sizeof_VkPipelineRasterizationLineStateCreateInfoKHR_self((const VkPipelineRasterizationLineStateCreateInfoKHR *)pnext);
return size;
case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT:
if (!vn_cs_renderer_protocol_has_extension(255 /* VK_EXT_provoking_vertex */))
@ -1276,13 +1276,13 @@ vn_encode_VkPipelineRasterizationStateCreateInfo_pnext(struct vn_cs_encoder *enc
vn_encode_VkPipelineRasterizationStateCreateInfo_pnext(enc, pnext->pNext);
vn_encode_VkPipelineRasterizationDepthClipStateCreateInfoEXT_self(enc, (const VkPipelineRasterizationDepthClipStateCreateInfoEXT *)pnext);
return;
case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_EXT:
if (!vn_cs_renderer_protocol_has_extension(260 /* VK_EXT_line_rasterization */))
case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_LINE_STATE_CREATE_INFO_KHR:
if (!vn_cs_renderer_protocol_has_extension(260 /* VK_EXT_line_rasterization */) && !vn_cs_renderer_protocol_has_extension(535 /* VK_KHR_line_rasterization */))
break;
vn_encode_simple_pointer(enc, pnext);
vn_encode_VkStructureType(enc, &pnext->sType);
vn_encode_VkPipelineRasterizationStateCreateInfo_pnext(enc, pnext->pNext);
vn_encode_VkPipelineRasterizationLineStateCreateInfoEXT_self(enc, (const VkPipelineRasterizationLineStateCreateInfoEXT *)pnext);
vn_encode_VkPipelineRasterizationLineStateCreateInfoKHR_self(enc, (const VkPipelineRasterizationLineStateCreateInfoKHR *)pnext);
return;
case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT:
if (!vn_cs_renderer_protocol_has_extension(255 /* VK_EXT_provoking_vertex */))

43
src/virtio/venus-protocol/vn_protocol_driver_types.h
View file

@ -1363,6 +1363,27 @@ vn_decode_VkQueryPipelineStatisticFlagBits(struct vn_cs_decoder *dec, VkQueryPip
vn_decode_int32_t(dec, (int32_t *)val);
}
/* enum VkMemoryMapFlagBits */
static inline size_t
vn_sizeof_VkMemoryMapFlagBits(const VkMemoryMapFlagBits *val)
{
assert(sizeof(*val) == sizeof(int32_t));
return vn_sizeof_int32_t((const int32_t *)val);
}
static inline void
vn_encode_VkMemoryMapFlagBits(struct vn_cs_encoder *enc, const VkMemoryMapFlagBits *val)
{
vn_encode_int32_t(enc, (const int32_t *)val);
}
static inline void
vn_decode_VkMemoryMapFlagBits(struct vn_cs_decoder *dec, VkMemoryMapFlagBits *val)
{
vn_decode_int32_t(dec, (int32_t *)val);
}
/* enum VkImageAspectFlagBits */
static inline size_t
@ -3040,41 +3061,41 @@ vn_decode_VkPointClippingBehavior(struct vn_cs_decoder *dec, VkPointClippingBeha
vn_decode_int32_t(dec, (int32_t *)val);
}
/* enum VkTimeDomainEXT */
/* enum VkTimeDomainKHR */
static inline size_t
vn_sizeof_VkTimeDomainEXT(const VkTimeDomainEXT *val)
vn_sizeof_VkTimeDomainKHR(const VkTimeDomainKHR *val)
{
assert(sizeof(*val) == sizeof(int32_t));
return vn_sizeof_int32_t((const int32_t *)val);
}
static inline void
vn_encode_VkTimeDomainEXT(struct vn_cs_encoder *enc, const VkTimeDomainEXT *val)
vn_encode_VkTimeDomainKHR(struct vn_cs_encoder *enc, const VkTimeDomainKHR *val)
{
vn_encode_int32_t(enc, (const int32_t *)val);
}
static inline void
vn_decode_VkTimeDomainEXT(struct vn_cs_decoder *dec, VkTimeDomainEXT *val)
vn_decode_VkTimeDomainKHR(struct vn_cs_decoder *dec, VkTimeDomainKHR *val)
{
vn_decode_int32_t(dec, (int32_t *)val);
}
static inline size_t
vn_sizeof_VkTimeDomainEXT_array(const VkTimeDomainEXT *val, uint32_t count)
vn_sizeof_VkTimeDomainKHR_array(const VkTimeDomainKHR *val, uint32_t count)
{
return vn_sizeof_int32_t_array((const int32_t *)val, count);
}
static inline void
vn_encode_VkTimeDomainEXT_array(struct vn_cs_encoder *enc, const VkTimeDomainEXT *val, uint32_t count)
vn_encode_VkTimeDomainKHR_array(struct vn_cs_encoder *enc, const VkTimeDomainKHR *val, uint32_t count)
{
vn_encode_int32_t_array(enc, (const int32_t *)val, count);
}
static inline void
vn_decode_VkTimeDomainEXT_array(struct vn_cs_decoder *dec, VkTimeDomainEXT *val, uint32_t count)
vn_decode_VkTimeDomainKHR_array(struct vn_cs_decoder *dec, VkTimeDomainKHR *val, uint32_t count)
{
vn_decode_int32_t_array(dec, (int32_t *)val, count);
}
@ -3121,23 +3142,23 @@ vn_decode_VkSemaphoreType(struct vn_cs_decoder *dec, VkSemaphoreType *val)
vn_decode_int32_t(dec, (int32_t *)val);
}
/* enum VkLineRasterizationModeEXT */
/* enum VkLineRasterizationModeKHR */
static inline size_t
vn_sizeof_VkLineRasterizationModeEXT(const VkLineRasterizationModeEXT *val)
vn_sizeof_VkLineRasterizationModeKHR(const VkLineRasterizationModeKHR *val)
{
assert(sizeof(*val) == sizeof(int32_t));
return vn_sizeof_int32_t((const int32_t *)val);
}
static inline void
vn_encode_VkLineRasterizationModeEXT(struct vn_cs_encoder *enc, const VkLineRasterizationModeEXT *val)
vn_encode_VkLineRasterizationModeKHR(struct vn_cs_encoder *enc, const VkLineRasterizationModeKHR *val)
{
vn_encode_int32_t(enc, (const int32_t *)val);
}
static inline void
vn_decode_VkLineRasterizationModeEXT(struct vn_cs_decoder *dec, VkLineRasterizationModeEXT *val)
vn_decode_VkLineRasterizationModeKHR(struct vn_cs_decoder *dec, VkLineRasterizationModeKHR *val)
{
vn_decode_int32_t(dec, (int32_t *)val);
}

4
src/virtio/vulkan/vn_command_buffer.c
View file

@ -2005,11 +2005,11 @@ vn_CmdDispatchBase(VkCommandBuffer commandBuffer,
}
void
vn_CmdSetLineStippleEXT(VkCommandBuffer commandBuffer,
vn_CmdSetLineStippleKHR(VkCommandBuffer commandBuffer,
uint32_t lineStippleFactor,
uint16_t lineStipplePattern)
{
VN_CMD_ENQUEUE(vkCmdSetLineStippleEXT, commandBuffer, lineStippleFactor,
VN_CMD_ENQUEUE(vkCmdSetLineStippleKHR, commandBuffer, lineStippleFactor,
lineStipplePattern);
}

12
src/virtio/vulkan/vn_device.c
View file

@ -676,10 +676,10 @@ vn_GetDeviceGroupPeerMemoryFeatures(
}
VkResult
vn_GetCalibratedTimestampsEXT(
vn_GetCalibratedTimestampsKHR(
VkDevice device,
uint32_t timestampCount,
const VkCalibratedTimestampInfoEXT *pTimestampInfos,
const VkCalibratedTimestampInfoKHR *pTimestampInfos,
uint64_t *pTimestamps,
uint64_t *pMaxDeviation)
{
@ -696,10 +696,10 @@ vn_GetCalibratedTimestampsEXT(
for (domain = 0; domain < timestampCount; domain++) {
switch (pTimestampInfos[domain].timeDomain) {
case VK_TIME_DOMAIN_DEVICE_EXT: {
case VK_TIME_DOMAIN_DEVICE_KHR: {
uint64_t device_max_deviation = 0;
ret = vn_call_vkGetCalibratedTimestampsEXT(
ret = vn_call_vkGetCalibratedTimestampsKHR(
dev->primary_ring, device, 1, &pTimestampInfos[domain],
&pTimestamps[domain], &device_max_deviation);
@ -709,12 +709,12 @@ vn_GetCalibratedTimestampsEXT(
max_clock_period = MAX2(max_clock_period, device_max_deviation);
break;
}
case VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT:
case VK_TIME_DOMAIN_CLOCK_MONOTONIC_KHR:
pTimestamps[domain] = vk_clock_gettime(CLOCK_MONOTONIC);
max_clock_period = MAX2(max_clock_period, 1);
break;
#ifdef CLOCK_MONOTONIC_RAW
case VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT:
case VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_KHR:
pTimestamps[domain] = begin;
break;
#endif

6
src/virtio/vulkan/vn_physical_device.c
View file

@ -2709,16 +2709,16 @@ vn_GetPhysicalDeviceExternalSemaphoreProperties(
}
VkResult
vn_GetPhysicalDeviceCalibrateableTimeDomainsEXT(
vn_GetPhysicalDeviceCalibrateableTimeDomainsKHR(
VkPhysicalDevice physicalDevice,
uint32_t *pTimeDomainCount,
VkTimeDomainEXT *pTimeDomains)
VkTimeDomainKHR *pTimeDomains)
{
struct vn_physical_device *physical_dev =
vn_physical_device_from_handle(physicalDevice);
struct vn_ring *ring = physical_dev->instance->ring.ring;
return vn_call_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(
return vn_call_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(
ring, physicalDevice, pTimeDomainCount, pTimeDomains);
}