system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 18:04:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winevulkan: Update to VK spec version 1.2.154.

Browse source 
Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com>
Signed-off-by: Daniel Koch <dkoch@nvidia.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Liam Middlebrook 2020-09-21 12:01:34 -07:00 committed by Alexandre Julliard
parent 60a8f050a5
commit de508759c6
5 changed files with 1023 additions and 489 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/winevulkan/make_vulkan
View file

@ -64,7 +64,7 @@ from enum import Enum
LOGGER = logging.Logger("vulkan")
LOGGER.addHandler(logging.StreamHandler())
VK_XML_VERSION = "1.2.149"
VK_XML_VERSION = "1.2.154"
WINE_VK_VERSION = (1, 2)
# Filenames to create.

253
dlls/winevulkan/vulkan_thunks.c
View file

@ -213,6 +213,21 @@ static inline void convert_VkRenderPassBeginInfo_win_to_host(const VkRenderPassB
out->pClearValues = in->pClearValues;
}
static inline void convert_VkBlitImageInfo2KHR_win_to_host(const VkBlitImageInfo2KHR *in, VkBlitImageInfo2KHR_host *out)
{
if (!in) return;
out->sType = in->sType;
out->pNext = in->pNext;
out->srcImage = in->srcImage;
out->srcImageLayout = in->srcImageLayout;
out->dstImage = in->dstImage;
out->dstImageLayout = in->dstImageLayout;
out->regionCount = in->regionCount;
out->pRegions = in->pRegions;
out->filter = in->filter;
}
static inline void convert_VkGeometryTrianglesNV_win_to_host(const VkGeometryTrianglesNV *in, VkGeometryTrianglesNV_host *out)
{
if (!in) return;
@ -322,6 +337,50 @@ static inline void free_VkBufferCopy_array(VkBufferCopy_host *in, uint32_t count
heap_free(in);
}
static inline VkBufferCopy2KHR_host *convert_VkBufferCopy2KHR_array_win_to_host(const VkBufferCopy2KHR *in, uint32_t count)
{
VkBufferCopy2KHR_host *out;
unsigned int i;
if (!in) return NULL;
out = heap_alloc(count * sizeof(*out));
for (i = 0; i < count; i++)
{
out[i].sType = in[i].sType;
out[i].pNext = in[i].pNext;
out[i].srcOffset = in[i].srcOffset;
out[i].dstOffset = in[i].dstOffset;
out[i].size = in[i].size;
}
return out;
}
static inline void free_VkBufferCopy2KHR_array(VkBufferCopy2KHR_host *in, uint32_t count)
{
if (!in) return;
heap_free(in);
}
static inline void convert_VkCopyBufferInfo2KHR_win_to_host(const VkCopyBufferInfo2KHR *in, VkCopyBufferInfo2KHR_host *out)
{
if (!in) return;
out->sType = in->sType;
out->pNext = in->pNext;
out->srcBuffer = in->srcBuffer;
out->dstBuffer = in->dstBuffer;
out->regionCount = in->regionCount;
out->pRegions = convert_VkBufferCopy2KHR_array_win_to_host(in->pRegions, in->regionCount);
}
static inline void free_VkCopyBufferInfo2KHR(VkCopyBufferInfo2KHR_host *in)
{
free_VkBufferCopy2KHR_array((VkBufferCopy2KHR_host *)in->pRegions, in->regionCount);
}
static inline VkBufferImageCopy_host *convert_VkBufferImageCopy_array_win_to_host(const VkBufferImageCopy *in, uint32_t count)
{
VkBufferImageCopy_host *out;
@ -350,6 +409,86 @@ static inline void free_VkBufferImageCopy_array(VkBufferImageCopy_host *in, uint
heap_free(in);
}
static inline VkBufferImageCopy2KHR_host *convert_VkBufferImageCopy2KHR_array_win_to_host(const VkBufferImageCopy2KHR *in, uint32_t count)
{
VkBufferImageCopy2KHR_host *out;
unsigned int i;
if (!in) return NULL;
out = heap_alloc(count * sizeof(*out));
for (i = 0; i < count; i++)
{
out[i].sType = in[i].sType;
out[i].pNext = in[i].pNext;
out[i].bufferOffset = in[i].bufferOffset;
out[i].bufferRowLength = in[i].bufferRowLength;
out[i].bufferImageHeight = in[i].bufferImageHeight;
out[i].imageSubresource = in[i].imageSubresource;
out[i].imageOffset = in[i].imageOffset;
out[i].imageExtent = in[i].imageExtent;
}
return out;
}
static inline void free_VkBufferImageCopy2KHR_array(VkBufferImageCopy2KHR_host *in, uint32_t count)
{
if (!in) return;
heap_free(in);
}
static inline void convert_VkCopyBufferToImageInfo2KHR_win_to_host(const VkCopyBufferToImageInfo2KHR *in, VkCopyBufferToImageInfo2KHR_host *out)
{
if (!in) return;
out->sType = in->sType;
out->pNext = in->pNext;
out->srcBuffer = in->srcBuffer;
out->dstImage = in->dstImage;
out->dstImageLayout = in->dstImageLayout;
out->regionCount = in->regionCount;
out->pRegions = convert_VkBufferImageCopy2KHR_array_win_to_host(in->pRegions, in->regionCount);
}
static inline void free_VkCopyBufferToImageInfo2KHR(VkCopyBufferToImageInfo2KHR_host *in)
{
free_VkBufferImageCopy2KHR_array((VkBufferImageCopy2KHR_host *)in->pRegions, in->regionCount);
}
static inline void convert_VkCopyImageInfo2KHR_win_to_host(const VkCopyImageInfo2KHR *in, VkCopyImageInfo2KHR_host *out)
{
if (!in) return;
out->sType = in->sType;
out->pNext = in->pNext;
out->srcImage = in->srcImage;
out->srcImageLayout = in->srcImageLayout;
out->dstImage = in->dstImage;
out->dstImageLayout = in->dstImageLayout;
out->regionCount = in->regionCount;
out->pRegions = in->pRegions;
}
static inline void convert_VkCopyImageToBufferInfo2KHR_win_to_host(const VkCopyImageToBufferInfo2KHR *in, VkCopyImageToBufferInfo2KHR_host *out)
{
if (!in) return;
out->sType = in->sType;
out->pNext = in->pNext;
out->srcImage = in->srcImage;
out->srcImageLayout = in->srcImageLayout;
out->dstBuffer = in->dstBuffer;
out->regionCount = in->regionCount;
out->pRegions = convert_VkBufferImageCopy2KHR_array_win_to_host(in->pRegions, in->regionCount);
}
static inline void free_VkCopyImageToBufferInfo2KHR(VkCopyImageToBufferInfo2KHR_host *in)
{
free_VkBufferImageCopy2KHR_array((VkBufferImageCopy2KHR_host *)in->pRegions, in->regionCount);
}
static inline VkIndirectCommandsStreamNV_host *convert_VkIndirectCommandsStreamNV_array_win_to_host(const VkIndirectCommandsStreamNV *in, uint32_t count)
{
VkIndirectCommandsStreamNV_host *out;
@ -552,6 +691,20 @@ static inline void free_VkWriteDescriptorSet_array(VkWriteDescriptorSet_host *in
heap_free(in);
}
static inline void convert_VkResolveImageInfo2KHR_win_to_host(const VkResolveImageInfo2KHR *in, VkResolveImageInfo2KHR_host *out)
{
if (!in) return;
out->sType = in->sType;
out->pNext = in->pNext;
out->srcImage = in->srcImage;
out->srcImageLayout = in->srcImageLayout;
out->dstImage = in->dstImage;
out->dstImageLayout = in->dstImageLayout;
out->regionCount = in->regionCount;
out->pRegions = in->pRegions;
}
static inline void convert_VkPerformanceMarkerInfoINTEL_win_to_host(const VkPerformanceMarkerInfoINTEL *in, VkPerformanceMarkerInfoINTEL_host *out)
{
if (!in) return;
@ -3202,6 +3355,21 @@ void WINAPI wine_vkCmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage,
commandBuffer->device->funcs.p_vkCmdBlitImage(commandBuffer->command_buffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter);
}
static void WINAPI wine_vkCmdBlitImage2KHR(VkCommandBuffer commandBuffer, const VkBlitImageInfo2KHR *pBlitImageInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkBlitImageInfo2KHR_host pBlitImageInfo_host;
TRACE("%p, %p\n", commandBuffer, pBlitImageInfo);
convert_VkBlitImageInfo2KHR_win_to_host(pBlitImageInfo, &pBlitImageInfo_host);
commandBuffer->device->funcs.p_vkCmdBlitImage2KHR(commandBuffer->command_buffer, &pBlitImageInfo_host);
#else
TRACE("%p, %p\n", commandBuffer, pBlitImageInfo);
commandBuffer->device->funcs.p_vkCmdBlitImage2KHR(commandBuffer->command_buffer, pBlitImageInfo);
#endif
}
static void WINAPI wine_vkCmdBuildAccelerationStructureNV(VkCommandBuffer commandBuffer, const VkAccelerationStructureInfoNV *pInfo, VkBuffer instanceData, VkDeviceSize instanceOffset, VkBool32 update, VkAccelerationStructureKHR dst, VkAccelerationStructureKHR src, VkBuffer scratch, VkDeviceSize scratchOffset)
{
#if defined(USE_STRUCT_CONVERSION)
@ -3258,6 +3426,22 @@ void WINAPI wine_vkCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuff
#endif
}
static void WINAPI wine_vkCmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR *pCopyBufferInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkCopyBufferInfo2KHR_host pCopyBufferInfo_host;
TRACE("%p, %p\n", commandBuffer, pCopyBufferInfo);
convert_VkCopyBufferInfo2KHR_win_to_host(pCopyBufferInfo, &pCopyBufferInfo_host);
commandBuffer->device->funcs.p_vkCmdCopyBuffer2KHR(commandBuffer->command_buffer, &pCopyBufferInfo_host);
free_VkCopyBufferInfo2KHR(&pCopyBufferInfo_host);
#else
TRACE("%p, %p\n", commandBuffer, pCopyBufferInfo);
commandBuffer->device->funcs.p_vkCmdCopyBuffer2KHR(commandBuffer->command_buffer, pCopyBufferInfo);
#endif
}
void WINAPI wine_vkCmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkBufferImageCopy *pRegions)
{
#if defined(USE_STRUCT_CONVERSION)
@ -3274,12 +3458,43 @@ void WINAPI wine_vkCmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer
#endif
}
static void WINAPI wine_vkCmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkCopyBufferToImageInfo2KHR_host pCopyBufferToImageInfo_host;
TRACE("%p, %p\n", commandBuffer, pCopyBufferToImageInfo);
convert_VkCopyBufferToImageInfo2KHR_win_to_host(pCopyBufferToImageInfo, &pCopyBufferToImageInfo_host);
commandBuffer->device->funcs.p_vkCmdCopyBufferToImage2KHR(commandBuffer->command_buffer, &pCopyBufferToImageInfo_host);
free_VkCopyBufferToImageInfo2KHR(&pCopyBufferToImageInfo_host);
#else
TRACE("%p, %p\n", commandBuffer, pCopyBufferToImageInfo);
commandBuffer->device->funcs.p_vkCmdCopyBufferToImage2KHR(commandBuffer->command_buffer, pCopyBufferToImageInfo);
#endif
}
void WINAPI wine_vkCmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage dstImage, VkImageLayout dstImageLayout, uint32_t regionCount, const VkImageCopy *pRegions)
{
TRACE("%p, 0x%s, %#x, 0x%s, %#x, %u, %p\n", commandBuffer, wine_dbgstr_longlong(srcImage), srcImageLayout, wine_dbgstr_longlong(dstImage), dstImageLayout, regionCount, pRegions);
commandBuffer->device->funcs.p_vkCmdCopyImage(commandBuffer->command_buffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions);
}
static void WINAPI wine_vkCmdCopyImage2KHR(VkCommandBuffer commandBuffer, const VkCopyImageInfo2KHR *pCopyImageInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkCopyImageInfo2KHR_host pCopyImageInfo_host;
TRACE("%p, %p\n", commandBuffer, pCopyImageInfo);
convert_VkCopyImageInfo2KHR_win_to_host(pCopyImageInfo, &pCopyImageInfo_host);
commandBuffer->device->funcs.p_vkCmdCopyImage2KHR(commandBuffer->command_buffer, &pCopyImageInfo_host);
#else
TRACE("%p, %p\n", commandBuffer, pCopyImageInfo);
commandBuffer->device->funcs.p_vkCmdCopyImage2KHR(commandBuffer->command_buffer, pCopyImageInfo);
#endif
}
void WINAPI wine_vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferImageCopy *pRegions)
{
#if defined(USE_STRUCT_CONVERSION)
@ -3296,6 +3511,22 @@ void WINAPI wine_vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage s
#endif
}
static void WINAPI wine_vkCmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2KHR *pCopyImageToBufferInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkCopyImageToBufferInfo2KHR_host pCopyImageToBufferInfo_host;
TRACE("%p, %p\n", commandBuffer, pCopyImageToBufferInfo);
convert_VkCopyImageToBufferInfo2KHR_win_to_host(pCopyImageToBufferInfo, &pCopyImageToBufferInfo_host);
commandBuffer->device->funcs.p_vkCmdCopyImageToBuffer2KHR(commandBuffer->command_buffer, &pCopyImageToBufferInfo_host);
free_VkCopyImageToBufferInfo2KHR(&pCopyImageToBufferInfo_host);
#else
TRACE("%p, %p\n", commandBuffer, pCopyImageToBufferInfo);
commandBuffer->device->funcs.p_vkCmdCopyImageToBuffer2KHR(commandBuffer->command_buffer, pCopyImageToBufferInfo);
#endif
}
void WINAPI wine_vkCmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags)
{
TRACE("%p, 0x%s, %u, %u, 0x%s, 0x%s, 0x%s, %#x\n", commandBuffer, wine_dbgstr_longlong(queryPool), firstQuery, queryCount, wine_dbgstr_longlong(dstBuffer), wine_dbgstr_longlong(dstOffset), wine_dbgstr_longlong(stride), flags);
@ -3573,6 +3804,21 @@ void WINAPI wine_vkCmdResolveImage(VkCommandBuffer commandBuffer, VkImage srcIma
commandBuffer->device->funcs.p_vkCmdResolveImage(commandBuffer->command_buffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions);
}
static void WINAPI wine_vkCmdResolveImage2KHR(VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR *pResolveImageInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkResolveImageInfo2KHR_host pResolveImageInfo_host;
TRACE("%p, %p\n", commandBuffer, pResolveImageInfo);
convert_VkResolveImageInfo2KHR_win_to_host(pResolveImageInfo, &pResolveImageInfo_host);
commandBuffer->device->funcs.p_vkCmdResolveImage2KHR(commandBuffer->command_buffer, &pResolveImageInfo_host);
#else
TRACE("%p, %p\n", commandBuffer, pResolveImageInfo);
commandBuffer->device->funcs.p_vkCmdResolveImage2KHR(commandBuffer->command_buffer, pResolveImageInfo);
#endif
}
void WINAPI wine_vkCmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4])
{
TRACE("%p, %p\n", commandBuffer, blendConstants);
@ -5470,15 +5716,20 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkCmdBindVertexBuffers", &wine_vkCmdBindVertexBuffers},
{"vkCmdBindVertexBuffers2EXT", &wine_vkCmdBindVertexBuffers2EXT},
{"vkCmdBlitImage", &wine_vkCmdBlitImage},
{"vkCmdBlitImage2KHR", &wine_vkCmdBlitImage2KHR},
{"vkCmdBuildAccelerationStructureNV", &wine_vkCmdBuildAccelerationStructureNV},
{"vkCmdClearAttachments", &wine_vkCmdClearAttachments},
{"vkCmdClearColorImage", &wine_vkCmdClearColorImage},
{"vkCmdClearDepthStencilImage", &wine_vkCmdClearDepthStencilImage},
{"vkCmdCopyAccelerationStructureNV", &wine_vkCmdCopyAccelerationStructureNV},
{"vkCmdCopyBuffer", &wine_vkCmdCopyBuffer},
{"vkCmdCopyBuffer2KHR", &wine_vkCmdCopyBuffer2KHR},
{"vkCmdCopyBufferToImage", &wine_vkCmdCopyBufferToImage},
{"vkCmdCopyBufferToImage2KHR", &wine_vkCmdCopyBufferToImage2KHR},
{"vkCmdCopyImage", &wine_vkCmdCopyImage},
{"vkCmdCopyImage2KHR", &wine_vkCmdCopyImage2KHR},
{"vkCmdCopyImageToBuffer", &wine_vkCmdCopyImageToBuffer},
{"vkCmdCopyImageToBuffer2KHR", &wine_vkCmdCopyImageToBuffer2KHR},
{"vkCmdCopyQueryPoolResults", &wine_vkCmdCopyQueryPoolResults},
{"vkCmdDispatch", &wine_vkCmdDispatch},
{"vkCmdDispatchBase", &wine_vkCmdDispatchBase},
@ -5519,6 +5770,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkCmdResetEvent", &wine_vkCmdResetEvent},
{"vkCmdResetQueryPool", &wine_vkCmdResetQueryPool},
{"vkCmdResolveImage", &wine_vkCmdResolveImage},
{"vkCmdResolveImage2KHR", &wine_vkCmdResolveImage2KHR},
{"vkCmdSetBlendConstants", &wine_vkCmdSetBlendConstants},
{"vkCmdSetCheckpointNV", &wine_vkCmdSetCheckpointNV},
{"vkCmdSetCoarseSampleOrderNV", &wine_vkCmdSetCoarseSampleOrderNV},
@ -5876,6 +6128,7 @@ static const char * const vk_device_extensions[] =
"VK_KHR_8bit_storage",
"VK_KHR_bind_memory2",
"VK_KHR_buffer_device_address",
"VK_KHR_copy_commands2",
"VK_KHR_create_renderpass2",
"VK_KHR_dedicated_allocation",
"VK_KHR_depth_stencil_resolve",

134
dlls/winevulkan/vulkan_thunks.h
View file

@ -185,6 +185,20 @@ typedef struct VkRenderPassBeginInfo_host
} VkRenderPassBeginInfo_host;
typedef struct VkBlitImageInfo2KHR_host
{
VkStructureType sType;
const void *pNext;
VkImage srcImage;
VkImageLayout srcImageLayout;
VkImage dstImage;
VkImageLayout dstImageLayout;
uint32_t regionCount;
const VkImageBlit2KHR *pRegions;
VkFilter filter;
} VkBlitImageInfo2KHR_host;
typedef struct VkGeometryTrianglesNV_host
{
VkStructureType sType;
@ -251,6 +265,27 @@ typedef struct VkBufferCopy_host
} VkBufferCopy_host;
typedef struct VkBufferCopy2KHR_host
{
VkStructureType sType;
const void *pNext;
VkDeviceSize srcOffset;
VkDeviceSize dstOffset;
VkDeviceSize size;
} VkBufferCopy2KHR_host;
typedef struct VkCopyBufferInfo2KHR_host
{
VkStructureType sType;
const void *pNext;
VkBuffer srcBuffer;
VkBuffer dstBuffer;
uint32_t regionCount;
const VkBufferCopy2KHR_host *pRegions;
} VkCopyBufferInfo2KHR_host;
typedef struct VkBufferImageCopy_host
{
VkDeviceSize bufferOffset;
@ -262,6 +297,56 @@ typedef struct VkBufferImageCopy_host
} VkBufferImageCopy_host;
typedef struct VkBufferImageCopy2KHR_host
{
VkStructureType sType;
const void *pNext;
VkDeviceSize bufferOffset;
uint32_t bufferRowLength;
uint32_t bufferImageHeight;
VkImageSubresourceLayers imageSubresource;
VkOffset3D imageOffset;
VkExtent3D imageExtent;
} VkBufferImageCopy2KHR_host;
typedef struct VkCopyBufferToImageInfo2KHR_host
{
VkStructureType sType;
const void *pNext;
VkBuffer srcBuffer;
VkImage dstImage;
VkImageLayout dstImageLayout;
uint32_t regionCount;
const VkBufferImageCopy2KHR_host *pRegions;
} VkCopyBufferToImageInfo2KHR_host;
typedef struct VkCopyImageInfo2KHR_host
{
VkStructureType sType;
const void *pNext;
VkImage srcImage;
VkImageLayout srcImageLayout;
VkImage dstImage;
VkImageLayout dstImageLayout;
uint32_t regionCount;
const VkImageCopy2KHR *pRegions;
} VkCopyImageInfo2KHR_host;
typedef struct VkCopyImageToBufferInfo2KHR_host
{
VkStructureType sType;
const void *pNext;
VkImage srcImage;
VkImageLayout srcImageLayout;
VkBuffer dstBuffer;
uint32_t regionCount;
const VkBufferImageCopy2KHR_host *pRegions;
} VkCopyImageToBufferInfo2KHR_host;
typedef struct VkIndirectCommandsStreamNV_host
{
VkBuffer buffer;
@ -349,6 +434,19 @@ typedef struct VkWriteDescriptorSet_host
} VkWriteDescriptorSet_host;
typedef struct VkResolveImageInfo2KHR_host
{
VkStructureType sType;
const void *pNext;
VkImage srcImage;
VkImageLayout srcImageLayout;
VkImage dstImage;
VkImageLayout dstImageLayout;
uint32_t regionCount;
const VkImageResolve2KHR *pRegions;
} VkResolveImageInfo2KHR_host;
typedef struct VkPerformanceMarkerInfoINTEL_host
{
VkStructureType sType;
@ -1064,6 +1162,11 @@ struct vulkan_device_funcs
void (*p_vkCmdBindVertexBuffers)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *);
void (*p_vkCmdBindVertexBuffers2EXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *, const VkDeviceSize *, const VkDeviceSize *);
void (*p_vkCmdBlitImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageBlit *, VkFilter);
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdBlitImage2KHR)(VkCommandBuffer, const VkBlitImageInfo2KHR_host *);
#else
void (*p_vkCmdBlitImage2KHR)(VkCommandBuffer, const VkBlitImageInfo2KHR *);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdBuildAccelerationStructureNV)(VkCommandBuffer, const VkAccelerationStructureInfoNV_host *, VkBuffer, VkDeviceSize, VkBool32, VkAccelerationStructureKHR, VkAccelerationStructureKHR, VkBuffer, VkDeviceSize);
#else
@ -1078,16 +1181,36 @@ struct vulkan_device_funcs
#else
void (*p_vkCmdCopyBuffer)(VkCommandBuffer, VkBuffer, VkBuffer, uint32_t, const VkBufferCopy *);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdCopyBuffer2KHR)(VkCommandBuffer, const VkCopyBufferInfo2KHR_host *);
#else
void (*p_vkCmdCopyBuffer2KHR)(VkCommandBuffer, const VkCopyBufferInfo2KHR *);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdCopyBufferToImage)(VkCommandBuffer, VkBuffer, VkImage, VkImageLayout, uint32_t, const VkBufferImageCopy_host *);
#else
void (*p_vkCmdCopyBufferToImage)(VkCommandBuffer, VkBuffer, VkImage, VkImageLayout, uint32_t, const VkBufferImageCopy *);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdCopyBufferToImage2KHR)(VkCommandBuffer, const VkCopyBufferToImageInfo2KHR_host *);
#else
void (*p_vkCmdCopyBufferToImage2KHR)(VkCommandBuffer, const VkCopyBufferToImageInfo2KHR *);
#endif
void (*p_vkCmdCopyImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageCopy *);
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdCopyImage2KHR)(VkCommandBuffer, const VkCopyImageInfo2KHR_host *);
#else
void (*p_vkCmdCopyImage2KHR)(VkCommandBuffer, const VkCopyImageInfo2KHR *);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdCopyImageToBuffer)(VkCommandBuffer, VkImage, VkImageLayout, VkBuffer, uint32_t, const VkBufferImageCopy_host *);
#else
void (*p_vkCmdCopyImageToBuffer)(VkCommandBuffer, VkImage, VkImageLayout, VkBuffer, uint32_t, const VkBufferImageCopy *);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdCopyImageToBuffer2KHR)(VkCommandBuffer, const VkCopyImageToBufferInfo2KHR_host *);
#else
void (*p_vkCmdCopyImageToBuffer2KHR)(VkCommandBuffer, const VkCopyImageToBufferInfo2KHR *);
#endif
void (*p_vkCmdCopyQueryPoolResults)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t, VkBuffer, VkDeviceSize, VkDeviceSize, VkQueryResultFlags);
void (*p_vkCmdDispatch)(VkCommandBuffer, uint32_t, uint32_t, uint32_t);
@ -1145,6 +1268,11 @@ struct vulkan_device_funcs
void (*p_vkCmdResetEvent)(VkCommandBuffer, VkEvent, VkPipelineStageFlags);
void (*p_vkCmdResetQueryPool)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t);
void (*p_vkCmdResolveImage)(VkCommandBuffer, VkImage, VkImageLayout, VkImage, VkImageLayout, uint32_t, const VkImageResolve *);
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdResolveImage2KHR)(VkCommandBuffer, const VkResolveImageInfo2KHR_host *);
#else
void (*p_vkCmdResolveImage2KHR)(VkCommandBuffer, const VkResolveImageInfo2KHR *);
#endif
void (*p_vkCmdSetBlendConstants)(VkCommandBuffer, const float[4]);
void (*p_vkCmdSetCheckpointNV)(VkCommandBuffer, const void *);
void (*p_vkCmdSetCoarseSampleOrderNV)(VkCommandBuffer, VkCoarseSampleOrderTypeNV, uint32_t, const VkCoarseSampleOrderCustomNV *);
@ -1628,15 +1756,20 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkCmdBindVertexBuffers) \
USE_VK_FUNC(vkCmdBindVertexBuffers2EXT) \
USE_VK_FUNC(vkCmdBlitImage) \
USE_VK_FUNC(vkCmdBlitImage2KHR) \
USE_VK_FUNC(vkCmdBuildAccelerationStructureNV) \
USE_VK_FUNC(vkCmdClearAttachments) \
USE_VK_FUNC(vkCmdClearColorImage) \
USE_VK_FUNC(vkCmdClearDepthStencilImage) \
USE_VK_FUNC(vkCmdCopyAccelerationStructureNV) \
USE_VK_FUNC(vkCmdCopyBuffer) \
USE_VK_FUNC(vkCmdCopyBuffer2KHR) \
USE_VK_FUNC(vkCmdCopyBufferToImage) \
USE_VK_FUNC(vkCmdCopyBufferToImage2KHR) \
USE_VK_FUNC(vkCmdCopyImage) \
USE_VK_FUNC(vkCmdCopyImage2KHR) \
USE_VK_FUNC(vkCmdCopyImageToBuffer) \
USE_VK_FUNC(vkCmdCopyImageToBuffer2KHR) \
USE_VK_FUNC(vkCmdCopyQueryPoolResults) \
USE_VK_FUNC(vkCmdDispatch) \
USE_VK_FUNC(vkCmdDispatchBase) \
@ -1677,6 +1810,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkCmdResetEvent) \
USE_VK_FUNC(vkCmdResetQueryPool) \
USE_VK_FUNC(vkCmdResolveImage) \
USE_VK_FUNC(vkCmdResolveImage2KHR) \
USE_VK_FUNC(vkCmdSetBlendConstants) \
USE_VK_FUNC(vkCmdSetCheckpointNV) \
USE_VK_FUNC(vkCmdSetCoarseSampleOrderNV) \

2
dlls/winevulkan/winevulkan.json
View file

@ -2,6 +2,6 @@
"file_format_version": "1.0.0",
"ICD": {
"library_path": ".\\winevulkan.dll",
"api_version": "1.2.149"
"api_version": "1.2.154"
}
}

1121
include/wine/vulkan.h
View file

File diff suppressed because it is too large Load diff