Skip to content

W
wine-winehq
Commit 7b1622d1 authored by Liam Middlebrook's avatar Liam Middlebrook Committed by Alexandre Julliard
Browse files
Options

winevulkan: Update to VK spec version spec 1.2.134.

Signed-off-by: 's avatarLiam Middlebrook <lmiddlebrook@nvidia.com> Signed-off-by: 's avatarPiers Daniell <pdaniell@nvidia.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent c32d1ad0
Hide whitespace changes
Inline Side-by-side
Showing with 399 additions and 92 deletions
dlls/vulkan-1/vulkan-1.spec
View file @ 7b1622d1
......@@ -3,7 +3,7 @@
# This file is generated from Vulkan vk.xml file covered
# by the following copyright and permission notice:
#
# Copyright (c) 2015-2019 The Khronos Group Inc.
# Copyright (c) 2015-2020 The Khronos Group Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......@@ -46,6 +46,7 @@
@ stdcall vkBindImageMemory2(ptr long ptr) winevulkan.wine_vkBindImageMemory2
@ stdcall vkCmdBeginQuery(ptr int64 long long) winevulkan.wine_vkCmdBeginQuery
@ stdcall vkCmdBeginRenderPass(ptr ptr long) winevulkan.wine_vkCmdBeginRenderPass
@ stdcall vkCmdBeginRenderPass2(ptr ptr ptr) winevulkan.wine_vkCmdBeginRenderPass2
@ stdcall vkCmdBindDescriptorSets(ptr long int64 long long ptr long ptr) winevulkan.wine_vkCmdBindDescriptorSets
@ stdcall vkCmdBindIndexBuffer(ptr int64 int64 long) winevulkan.wine_vkCmdBindIndexBuffer
@ stdcall vkCmdBindPipeline(ptr long int64) winevulkan.wine_vkCmdBindPipeline
......@@ -65,12 +66,16 @@
@ stdcall vkCmdDraw(ptr long long long long) winevulkan.wine_vkCmdDraw
@ stdcall vkCmdDrawIndexed(ptr long long long long long) winevulkan.wine_vkCmdDrawIndexed
@ stdcall vkCmdDrawIndexedIndirect(ptr int64 int64 long long) winevulkan.wine_vkCmdDrawIndexedIndirect
@ stdcall vkCmdDrawIndexedIndirectCount(ptr int64 int64 int64 int64 long long) winevulkan.wine_vkCmdDrawIndexedIndirectCount
@ stdcall vkCmdDrawIndirect(ptr int64 int64 long long) winevulkan.wine_vkCmdDrawIndirect
@ stdcall vkCmdDrawIndirectCount(ptr int64 int64 int64 int64 long long) winevulkan.wine_vkCmdDrawIndirectCount
@ stdcall vkCmdEndQuery(ptr int64 long) winevulkan.wine_vkCmdEndQuery
@ stdcall vkCmdEndRenderPass(ptr) winevulkan.wine_vkCmdEndRenderPass
@ stdcall vkCmdEndRenderPass2(ptr ptr) winevulkan.wine_vkCmdEndRenderPass2
@ stdcall vkCmdExecuteCommands(ptr long ptr) winevulkan.wine_vkCmdExecuteCommands
@ stdcall vkCmdFillBuffer(ptr int64 int64 int64 long) winevulkan.wine_vkCmdFillBuffer
@ stdcall vkCmdNextSubpass(ptr long) winevulkan.wine_vkCmdNextSubpass
@ stdcall vkCmdNextSubpass2(ptr ptr ptr) winevulkan.wine_vkCmdNextSubpass2
@ stdcall vkCmdPipelineBarrier(ptr long long long long ptr long ptr long ptr) winevulkan.wine_vkCmdPipelineBarrier
@ stdcall vkCmdPushConstants(ptr int64 long long long ptr) winevulkan.wine_vkCmdPushConstants
@ stdcall vkCmdResetEvent(ptr int64 long) winevulkan.wine_vkCmdResetEvent
......@@ -111,6 +116,7 @@
@ stdcall vkCreatePipelineLayout(ptr ptr ptr ptr) winevulkan.wine_vkCreatePipelineLayout
@ stdcall vkCreateQueryPool(ptr ptr ptr ptr) winevulkan.wine_vkCreateQueryPool
@ stdcall vkCreateRenderPass(ptr ptr ptr ptr) winevulkan.wine_vkCreateRenderPass
@ stdcall vkCreateRenderPass2(ptr ptr ptr ptr) winevulkan.wine_vkCreateRenderPass2
@ stdcall vkCreateSampler(ptr ptr ptr ptr) winevulkan.wine_vkCreateSampler
@ stdcall vkCreateSamplerYcbcrConversion(ptr ptr ptr ptr) winevulkan.wine_vkCreateSamplerYcbcrConversion
@ stdcall vkCreateSemaphore(ptr ptr ptr ptr) winevulkan.wine_vkCreateSemaphore
......@@ -155,13 +161,16 @@
@ stdcall vkFreeCommandBuffers(ptr int64 long ptr) winevulkan.wine_vkFreeCommandBuffers
@ stdcall vkFreeDescriptorSets(ptr int64 long ptr) winevulkan.wine_vkFreeDescriptorSets
@ stdcall vkFreeMemory(ptr int64 ptr) winevulkan.wine_vkFreeMemory
@ stdcall vkGetBufferDeviceAddress(ptr ptr) winevulkan.wine_vkGetBufferDeviceAddress
@ stdcall vkGetBufferMemoryRequirements(ptr int64 ptr) winevulkan.wine_vkGetBufferMemoryRequirements
@ stdcall vkGetBufferMemoryRequirements2(ptr ptr ptr) winevulkan.wine_vkGetBufferMemoryRequirements2
@ stdcall vkGetBufferOpaqueCaptureAddress(ptr ptr) winevulkan.wine_vkGetBufferOpaqueCaptureAddress
@ stdcall vkGetDescriptorSetLayoutSupport(ptr ptr ptr) winevulkan.wine_vkGetDescriptorSetLayoutSupport
@ stdcall vkGetDeviceGroupPeerMemoryFeatures(ptr long long long ptr) winevulkan.wine_vkGetDeviceGroupPeerMemoryFeatures
@ stdcall vkGetDeviceGroupPresentCapabilitiesKHR(ptr ptr) winevulkan.wine_vkGetDeviceGroupPresentCapabilitiesKHR
@ stdcall vkGetDeviceGroupSurfacePresentModesKHR(ptr int64 ptr) winevulkan.wine_vkGetDeviceGroupSurfacePresentModesKHR
@ stdcall vkGetDeviceMemoryCommitment(ptr int64 ptr) winevulkan.wine_vkGetDeviceMemoryCommitment
@ stdcall vkGetDeviceMemoryOpaqueCaptureAddress(ptr ptr) winevulkan.wine_vkGetDeviceMemoryOpaqueCaptureAddress
@ stdcall vkGetDeviceProcAddr(ptr str) winevulkan.wine_vkGetDeviceProcAddr
@ stdcall vkGetDeviceQueue(ptr long long ptr) winevulkan.wine_vkGetDeviceQueue
@ stdcall vkGetDeviceQueue2(ptr ptr ptr) winevulkan.wine_vkGetDeviceQueue2
......@@ -204,6 +213,7 @@
@ stdcall vkGetPipelineCacheData(ptr int64 ptr ptr) winevulkan.wine_vkGetPipelineCacheData
@ stdcall vkGetQueryPoolResults(ptr int64 long long long ptr int64 long) winevulkan.wine_vkGetQueryPoolResults
@ stdcall vkGetRenderAreaGranularity(ptr int64 ptr) winevulkan.wine_vkGetRenderAreaGranularity
@ stdcall vkGetSemaphoreCounterValue(ptr int64 ptr) winevulkan.wine_vkGetSemaphoreCounterValue
@ stdcall vkGetSwapchainImagesKHR(ptr int64 ptr ptr) winevulkan.wine_vkGetSwapchainImagesKHR
@ stdcall vkInvalidateMappedMemoryRanges(ptr long ptr) winevulkan.wine_vkInvalidateMappedMemoryRanges
@ stdcall vkMapMemory(ptr int64 int64 int64 long ptr) winevulkan.wine_vkMapMemory
......@@ -217,9 +227,12 @@
@ stdcall vkResetDescriptorPool(ptr int64 long) winevulkan.wine_vkResetDescriptorPool
@ stdcall vkResetEvent(ptr int64) winevulkan.wine_vkResetEvent
@ stdcall vkResetFences(ptr long ptr) winevulkan.wine_vkResetFences
@ stdcall vkResetQueryPool(ptr int64 long long) winevulkan.wine_vkResetQueryPool
@ stdcall vkSetEvent(ptr int64) winevulkan.wine_vkSetEvent
@ stdcall vkSignalSemaphore(ptr ptr) winevulkan.wine_vkSignalSemaphore
@ stdcall vkTrimCommandPool(ptr int64 long) winevulkan.wine_vkTrimCommandPool
@ stdcall vkUnmapMemory(ptr int64) winevulkan.wine_vkUnmapMemory
@ stdcall vkUpdateDescriptorSetWithTemplate(ptr int64 int64 ptr) winevulkan.wine_vkUpdateDescriptorSetWithTemplate
@ stdcall vkUpdateDescriptorSets(ptr long ptr long ptr) winevulkan.wine_vkUpdateDescriptorSets
@ stdcall vkWaitForFences(ptr long ptr long int64) winevulkan.wine_vkWaitForFences
@ stdcall vkWaitSemaphores(ptr ptr int64) winevulkan.wine_vkWaitSemaphores
dlls/winevulkan/make_vulkan
View file @ 7b1622d1
......@@ -64,8 +64,8 @@ from enum import Enum
LOGGER = logging.Logger("vulkan")
LOGGER.addHandler(logging.StreamHandler())
VK_XML_VERSION = "1.1.130"
WINE_VK_VERSION = (1, 1)
VK_XML_VERSION = "1.2.134"
WINE_VK_VERSION = (1, 2)
# Filenames to create.
WINE_VULKAN_H = "../../include/wine/vulkan.h"
......
dlls/winevulkan/vulkan_thunks.c
View file @ 7b1622d1
......@@ -3,7 +3,7 @@
* This file is generated from Vulkan vk.xml file covered
* by the following copyright and permission notice:
*
* Copyright (c) 2015-2019 The Khronos Group Inc.
* Copyright (c) 2015-2020 The Khronos Group Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -874,7 +874,7 @@ static inline void convert_VkMemoryRequirements2KHR_host_to_win(const VkMemoryRe
convert_VkMemoryRequirements_host_to_win(&in->memoryRequirements, &out->memoryRequirements);
}
static inline void convert_VkBufferDeviceAddressInfoKHR_win_to_host(const VkBufferDeviceAddressInfoKHR *in, VkBufferDeviceAddressInfoKHR_host *out)
static inline void convert_VkBufferDeviceAddressInfo_win_to_host(const VkBufferDeviceAddressInfo *in, VkBufferDeviceAddressInfo_host *out)
{
if (!in) return;
......@@ -909,7 +909,7 @@ static inline void convert_VkMemoryRequirements2_host_to_win(const VkMemoryRequi
convert_VkMemoryRequirements_host_to_win(&in->memoryRequirements, &out->memoryRequirements);
}
static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfoKHR_win_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfoKHR *in, VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host *out)
static inline void convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win_to_host(const VkDeviceMemoryOpaqueCaptureAddressInfo *in, VkDeviceMemoryOpaqueCaptureAddressInfo_host *out)
{
if (!in) return;
......@@ -1368,7 +1368,7 @@ static inline void free_VkBindSparseInfo_array(VkBindSparseInfo_host *in, uint32
heap_free(in);
}
static inline void convert_VkSemaphoreSignalInfoKHR_win_to_host(const VkSemaphoreSignalInfoKHR *in, VkSemaphoreSignalInfoKHR_host *out)
static inline void convert_VkSemaphoreSignalInfo_win_to_host(const VkSemaphoreSignalInfo *in, VkSemaphoreSignalInfo_host *out)
{
if (!in) return;
......@@ -1513,10 +1513,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES:
{
const VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR *in = (const VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR *)in_header;
VkPhysicalDeviceShaderSubgroupExtendedTypesFeaturesKHR *out;
const VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *in = (const VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *)in_header;
VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -1610,10 +1610,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES:
{
const VkPhysicalDeviceShaderFloat16Int8FeaturesKHR *in = (const VkPhysicalDeviceShaderFloat16Int8FeaturesKHR *)in_header;
VkPhysicalDeviceShaderFloat16Int8FeaturesKHR *out;
const VkPhysicalDeviceShaderFloat16Int8Features *in = (const VkPhysicalDeviceShaderFloat16Int8Features *)in_header;
VkPhysicalDeviceShaderFloat16Int8Features *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -1627,10 +1627,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES:
{
const VkPhysicalDeviceHostQueryResetFeaturesEXT *in = (const VkPhysicalDeviceHostQueryResetFeaturesEXT *)in_header;
VkPhysicalDeviceHostQueryResetFeaturesEXT *out;
const VkPhysicalDeviceHostQueryResetFeatures *in = (const VkPhysicalDeviceHostQueryResetFeatures *)in_header;
VkPhysicalDeviceHostQueryResetFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -1643,10 +1643,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES:
{
const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *in = (const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *)in_header;
VkPhysicalDeviceDescriptorIndexingFeaturesEXT *out;
const VkPhysicalDeviceDescriptorIndexingFeatures *in = (const VkPhysicalDeviceDescriptorIndexingFeatures *)in_header;
VkPhysicalDeviceDescriptorIndexingFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -1678,10 +1678,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES:
{
const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *in = (const VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *)in_header;
VkPhysicalDeviceTimelineSemaphoreFeaturesKHR *out;
const VkPhysicalDeviceTimelineSemaphoreFeatures *in = (const VkPhysicalDeviceTimelineSemaphoreFeatures *)in_header;
VkPhysicalDeviceTimelineSemaphoreFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -1694,10 +1694,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES:
{
const VkPhysicalDevice8BitStorageFeaturesKHR *in = (const VkPhysicalDevice8BitStorageFeaturesKHR *)in_header;
VkPhysicalDevice8BitStorageFeaturesKHR *out;
const VkPhysicalDevice8BitStorageFeatures *in = (const VkPhysicalDevice8BitStorageFeatures *)in_header;
VkPhysicalDevice8BitStorageFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -1729,10 +1729,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES:
{
const VkPhysicalDeviceVulkanMemoryModelFeaturesKHR *in = (const VkPhysicalDeviceVulkanMemoryModelFeaturesKHR *)in_header;
VkPhysicalDeviceVulkanMemoryModelFeaturesKHR *out;
const VkPhysicalDeviceVulkanMemoryModelFeatures *in = (const VkPhysicalDeviceVulkanMemoryModelFeatures *)in_header;
VkPhysicalDeviceVulkanMemoryModelFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -1747,10 +1747,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES:
{
const VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *in = (const VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *)in_header;
VkPhysicalDeviceShaderAtomicInt64FeaturesKHR *out;
const VkPhysicalDeviceShaderAtomicInt64Features *in = (const VkPhysicalDeviceShaderAtomicInt64Features *)in_header;
VkPhysicalDeviceShaderAtomicInt64Features *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -1995,10 +1995,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES:
{
const VkPhysicalDeviceScalarBlockLayoutFeaturesEXT *in = (const VkPhysicalDeviceScalarBlockLayoutFeaturesEXT *)in_header;
VkPhysicalDeviceScalarBlockLayoutFeaturesEXT *out;
const VkPhysicalDeviceScalarBlockLayoutFeatures *in = (const VkPhysicalDeviceScalarBlockLayoutFeatures *)in_header;
VkPhysicalDeviceScalarBlockLayoutFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -2011,10 +2011,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_UNIFORM_BUFFER_STANDARD_LAYOUT_FEATURES:
{
const VkPhysicalDeviceUniformBufferStandardLayoutFeaturesKHR *in = (const VkPhysicalDeviceUniformBufferStandardLayoutFeaturesKHR *)in_header;
VkPhysicalDeviceUniformBufferStandardLayoutFeaturesKHR *out;
const VkPhysicalDeviceUniformBufferStandardLayoutFeatures *in = (const VkPhysicalDeviceUniformBufferStandardLayoutFeatures *)in_header;
VkPhysicalDeviceUniformBufferStandardLayoutFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -2059,10 +2059,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES:
{
const VkPhysicalDeviceBufferDeviceAddressFeaturesKHR *in = (const VkPhysicalDeviceBufferDeviceAddressFeaturesKHR *)in_header;
VkPhysicalDeviceBufferDeviceAddressFeaturesKHR *out;
const VkPhysicalDeviceBufferDeviceAddressFeatures *in = (const VkPhysicalDeviceBufferDeviceAddressFeatures *)in_header;
VkPhysicalDeviceBufferDeviceAddressFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -2095,10 +2095,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES:
{
const VkPhysicalDeviceImagelessFramebufferFeaturesKHR *in = (const VkPhysicalDeviceImagelessFramebufferFeaturesKHR *)in_header;
VkPhysicalDeviceImagelessFramebufferFeaturesKHR *out;
const VkPhysicalDeviceImagelessFramebufferFeatures *in = (const VkPhysicalDeviceImagelessFramebufferFeatures *)in_header;
VkPhysicalDeviceImagelessFramebufferFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -2276,10 +2276,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR:
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES:
{
const VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR *in = (const VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR *)in_header;
VkPhysicalDeviceSeparateDepthStencilLayoutsFeaturesKHR *out;
const VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *in = (const VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *)in_header;
VkPhysicalDeviceSeparateDepthStencilLayoutsFeatures *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
......@@ -2378,6 +2378,95 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES:
{
const VkPhysicalDeviceVulkan11Features *in = (const VkPhysicalDeviceVulkan11Features *)in_header;
VkPhysicalDeviceVulkan11Features *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
out->sType = in->sType;
out->pNext = NULL;
out->storageBuffer16BitAccess = in->storageBuffer16BitAccess;
out->uniformAndStorageBuffer16BitAccess = in->uniformAndStorageBuffer16BitAccess;
out->storagePushConstant16 = in->storagePushConstant16;
out->storageInputOutput16 = in->storageInputOutput16;
out->multiview = in->multiview;
out->multiviewGeometryShader = in->multiviewGeometryShader;
out->multiviewTessellationShader = in->multiviewTessellationShader;
out->variablePointersStorageBuffer = in->variablePointersStorageBuffer;
out->variablePointers = in->variablePointers;
out->protectedMemory = in->protectedMemory;
out->samplerYcbcrConversion = in->samplerYcbcrConversion;
out->shaderDrawParameters = in->shaderDrawParameters;
out_header->pNext = (VkBaseOutStructure *)out;
out_header = out_header->pNext;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES:
{
const VkPhysicalDeviceVulkan12Features *in = (const VkPhysicalDeviceVulkan12Features *)in_header;
VkPhysicalDeviceVulkan12Features *out;
if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory;
out->sType = in->sType;
out->pNext = NULL;
out->samplerMirrorClampToEdge = in->samplerMirrorClampToEdge;
out->drawIndirectCount = in->drawIndirectCount;
out->storageBuffer8BitAccess = in->storageBuffer8BitAccess;
out->uniformAndStorageBuffer8BitAccess = in->uniformAndStorageBuffer8BitAccess;
out->storagePushConstant8 = in->storagePushConstant8;
out->shaderBufferInt64Atomics = in->shaderBufferInt64Atomics;
out->shaderSharedInt64Atomics = in->shaderSharedInt64Atomics;
out->shaderFloat16 = in->shaderFloat16;
out->shaderInt8 = in->shaderInt8;
out->descriptorIndexing = in->descriptorIndexing;
out->shaderInputAttachmentArrayDynamicIndexing = in->shaderInputAttachmentArrayDynamicIndexing;
out->shaderUniformTexelBufferArrayDynamicIndexing = in->shaderUniformTexelBufferArrayDynamicIndexing;
out->shaderStorageTexelBufferArrayDynamicIndexing = in->shaderStorageTexelBufferArrayDynamicIndexing;
out->shaderUniformBufferArrayNonUniformIndexing = in->shaderUniformBufferArrayNonUniformIndexing;
out->shaderSampledImageArrayNonUniformIndexing = in->shaderSampledImageArrayNonUniformIndexing;
out->shaderStorageBufferArrayNonUniformIndexing = in->shaderStorageBufferArrayNonUniformIndexing;
out->shaderStorageImageArrayNonUniformIndexing = in->shaderStorageImageArrayNonUniformIndexing;
out->shaderInputAttachmentArrayNonUniformIndexing = in->shaderInputAttachmentArrayNonUniformIndexing;
out->shaderUniformTexelBufferArrayNonUniformIndexing = in->shaderUniformTexelBufferArrayNonUniformIndexing;
out->shaderStorageTexelBufferArrayNonUniformIndexing = in->shaderStorageTexelBufferArrayNonUniformIndexing;
out->descriptorBindingUniformBufferUpdateAfterBind = in->descriptorBindingUniformBufferUpdateAfterBind;
out->descriptorBindingSampledImageUpdateAfterBind = in->descriptorBindingSampledImageUpdateAfterBind;
out->descriptorBindingStorageImageUpdateAfterBind = in->descriptorBindingStorageImageUpdateAfterBind;
out->descriptorBindingStorageBufferUpdateAfterBind = in->descriptorBindingStorageBufferUpdateAfterBind;
out->descriptorBindingUniformTexelBufferUpdateAfterBind = in->descriptorBindingUniformTexelBufferUpdateAfterBind;
out->descriptorBindingStorageTexelBufferUpdateAfterBind = in->descriptorBindingStorageTexelBufferUpdateAfterBind;
out->descriptorBindingUpdateUnusedWhilePending = in->descriptorBindingUpdateUnusedWhilePending;
out->descriptorBindingPartiallyBound = in->descriptorBindingPartiallyBound;
out->descriptorBindingVariableDescriptorCount = in->descriptorBindingVariableDescriptorCount;
out->runtimeDescriptorArray = in->runtimeDescriptorArray;
out->samplerFilterMinmax = in->samplerFilterMinmax;
out->scalarBlockLayout = in->scalarBlockLayout;
out->imagelessFramebuffer = in->imagelessFramebuffer;
out->uniformBufferStandardLayout = in->uniformBufferStandardLayout;
out->shaderSubgroupExtendedTypes = in->shaderSubgroupExtendedTypes;
out->separateDepthStencilLayouts = in->separateDepthStencilLayouts;
out->hostQueryReset = in->hostQueryReset;
out->timelineSemaphore = in->timelineSemaphore;
out->bufferDeviceAddress = in->bufferDeviceAddress;
out->bufferDeviceAddressCaptureReplay = in->bufferDeviceAddressCaptureReplay;
out->bufferDeviceAddressMultiDevice = in->bufferDeviceAddressMultiDevice;
out->vulkanMemoryModel = in->vulkanMemoryModel;
out->vulkanMemoryModelDeviceScope = in->vulkanMemoryModelDeviceScope;
out->vulkanMemoryModelAvailabilityVisibilityChains = in->vulkanMemoryModelAvailabilityVisibilityChains;
out->shaderOutputViewportIndex = in->shaderOutputViewportIndex;
out->shaderOutputLayer = in->shaderOutputLayer;
out->subgroupBroadcastDynamicId = in->subgroupBroadcastDynamicId;
out_header->pNext = (VkBaseOutStructure *)out;
out_header = out_header->pNext;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD:
{
const VkPhysicalDeviceCoherentMemoryFeaturesAMD *in = (const VkPhysicalDeviceCoherentMemoryFeaturesAMD *)in_header;
......@@ -2699,7 +2788,22 @@ void WINAPI wine_vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRen
#endif
}
static void WINAPI wine_vkCmdBeginRenderPass2KHR(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, const VkSubpassBeginInfoKHR *pSubpassBeginInfo)
void WINAPI wine_vkCmdBeginRenderPass2(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, const VkSubpassBeginInfo *pSubpassBeginInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkRenderPassBeginInfo_host pRenderPassBegin_host;
TRACE("%p, %p, %p\n", commandBuffer, pRenderPassBegin, pSubpassBeginInfo);
convert_VkRenderPassBeginInfo_win_to_host(pRenderPassBegin, &pRenderPassBegin_host);
commandBuffer->device->funcs.p_vkCmdBeginRenderPass2(commandBuffer->command_buffer, &pRenderPassBegin_host, pSubpassBeginInfo);
#else
TRACE("%p, %p, %p\n", commandBuffer, pRenderPassBegin, pSubpassBeginInfo);
commandBuffer->device->funcs.p_vkCmdBeginRenderPass2(commandBuffer->command_buffer, pRenderPassBegin, pSubpassBeginInfo);
#endif
}
static void WINAPI wine_vkCmdBeginRenderPass2KHR(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, const VkSubpassBeginInfo *pSubpassBeginInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkRenderPassBeginInfo_host pRenderPassBegin_host;
......@@ -2904,6 +3008,12 @@ void WINAPI wine_vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffe
commandBuffer->device->funcs.p_vkCmdDrawIndexedIndirect(commandBuffer->command_buffer, buffer, offset, drawCount, stride);
}
void WINAPI wine_vkCmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
{
TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride);
commandBuffer->device->funcs.p_vkCmdDrawIndexedIndirectCount(commandBuffer->command_buffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride);
}
static void WINAPI wine_vkCmdDrawIndexedIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
{
TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride);
......@@ -2928,6 +3038,12 @@ static void WINAPI wine_vkCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuf
commandBuffer->device->funcs.p_vkCmdDrawIndirectByteCountEXT(commandBuffer->command_buffer, instanceCount, firstInstance, counterBuffer, counterBufferOffset, counterOffset, vertexStride);
}
void WINAPI wine_vkCmdDrawIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
{
TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride);
commandBuffer->device->funcs.p_vkCmdDrawIndirectCount(commandBuffer->command_buffer, buffer, offset, countBuffer, countBufferOffset, maxDrawCount, stride);
}
static void WINAPI wine_vkCmdDrawIndirectCountAMD(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride)
{
TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %u, %u\n", commandBuffer, wine_dbgstr_longlong(buffer), wine_dbgstr_longlong(offset), wine_dbgstr_longlong(countBuffer), wine_dbgstr_longlong(countBufferOffset), maxDrawCount, stride);
......@@ -2982,7 +3098,13 @@ void WINAPI wine_vkCmdEndRenderPass(VkCommandBuffer commandBuffer)
commandBuffer->device->funcs.p_vkCmdEndRenderPass(commandBuffer->command_buffer);
}
static void WINAPI wine_vkCmdEndRenderPass2KHR(VkCommandBuffer commandBuffer, const VkSubpassEndInfoKHR *pSubpassEndInfo)
void WINAPI wine_vkCmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo)
{
TRACE("%p, %p\n", commandBuffer, pSubpassEndInfo);
commandBuffer->device->funcs.p_vkCmdEndRenderPass2(commandBuffer->command_buffer, pSubpassEndInfo);
}
static void WINAPI wine_vkCmdEndRenderPass2KHR(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo)
{
TRACE("%p, %p\n", commandBuffer, pSubpassEndInfo);
commandBuffer->device->funcs.p_vkCmdEndRenderPass2KHR(commandBuffer->command_buffer, pSubpassEndInfo);
......@@ -3006,7 +3128,13 @@ void WINAPI wine_vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassConten
commandBuffer->device->funcs.p_vkCmdNextSubpass(commandBuffer->command_buffer, contents);
}
static void WINAPI wine_vkCmdNextSubpass2KHR(VkCommandBuffer commandBuffer, const VkSubpassBeginInfoKHR *pSubpassBeginInfo, const VkSubpassEndInfoKHR *pSubpassEndInfo)
void WINAPI wine_vkCmdNextSubpass2(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo)
{
TRACE("%p, %p, %p\n", commandBuffer, pSubpassBeginInfo, pSubpassEndInfo);
commandBuffer->device->funcs.p_vkCmdNextSubpass2(commandBuffer->command_buffer, pSubpassBeginInfo, pSubpassEndInfo);
}
static void WINAPI wine_vkCmdNextSubpass2KHR(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo)
{
TRACE("%p, %p, %p\n", commandBuffer, pSubpassBeginInfo, pSubpassEndInfo);
commandBuffer->device->funcs.p_vkCmdNextSubpass2KHR(commandBuffer->command_buffer, pSubpassBeginInfo, pSubpassEndInfo);
......@@ -3525,7 +3653,13 @@ VkResult WINAPI wine_vkCreateRenderPass(VkDevice device, const VkRenderPassCreat
return device->funcs.p_vkCreateRenderPass(device->device, pCreateInfo, NULL, pRenderPass);
}
static VkResult WINAPI wine_vkCreateRenderPass2KHR(VkDevice device, const VkRenderPassCreateInfo2KHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass)
VkResult WINAPI wine_vkCreateRenderPass2(VkDevice device, const VkRenderPassCreateInfo2 *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass)
{
TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pRenderPass);
return device->funcs.p_vkCreateRenderPass2(device->device, pCreateInfo, NULL, pRenderPass);
}
static VkResult WINAPI wine_vkCreateRenderPass2KHR(VkDevice device, const VkRenderPassCreateInfo2 *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass)
{
TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pRenderPass);
return device->funcs.p_vkCreateRenderPass2KHR(device->device, pCreateInfo, NULL, pRenderPass);
......@@ -3818,14 +3952,31 @@ static void WINAPI wine_vkGetAccelerationStructureMemoryRequirementsNV(VkDevice
#endif
}
static VkDeviceAddress WINAPI wine_vkGetBufferDeviceAddressEXT(VkDevice device, const VkBufferDeviceAddressInfoKHR *pInfo)
VkDeviceAddress WINAPI wine_vkGetBufferDeviceAddress(VkDevice device, const VkBufferDeviceAddressInfo *pInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkDeviceAddress result;
VkBufferDeviceAddressInfoKHR_host pInfo_host;
VkBufferDeviceAddressInfo_host pInfo_host;
TRACE("%p, %p\n", device, pInfo);
convert_VkBufferDeviceAddressInfoKHR_win_to_host(pInfo, &pInfo_host);
convert_VkBufferDeviceAddressInfo_win_to_host(pInfo, &pInfo_host);
result = device->funcs.p_vkGetBufferDeviceAddress(device->device, &pInfo_host);
return result;
#else
TRACE("%p, %p\n", device, pInfo);
return device->funcs.p_vkGetBufferDeviceAddress(device->device, pInfo);
#endif
}
static VkDeviceAddress WINAPI wine_vkGetBufferDeviceAddressEXT(VkDevice device, const VkBufferDeviceAddressInfo *pInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkDeviceAddress result;
VkBufferDeviceAddressInfo_host pInfo_host;
TRACE("%p, %p\n", device, pInfo);
convert_VkBufferDeviceAddressInfo_win_to_host(pInfo, &pInfo_host);
result = device->funcs.p_vkGetBufferDeviceAddressEXT(device->device, &pInfo_host);
return result;
......@@ -3835,14 +3986,14 @@ static VkDeviceAddress WINAPI wine_vkGetBufferDeviceAddressEXT(VkDevice device,
#endif
}
static VkDeviceAddress WINAPI wine_vkGetBufferDeviceAddressKHR(VkDevice device, const VkBufferDeviceAddressInfoKHR *pInfo)
static VkDeviceAddress WINAPI wine_vkGetBufferDeviceAddressKHR(VkDevice device, const VkBufferDeviceAddressInfo *pInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkDeviceAddress result;
VkBufferDeviceAddressInfoKHR_host pInfo_host;
VkBufferDeviceAddressInfo_host pInfo_host;
TRACE("%p, %p\n", device, pInfo);
convert_VkBufferDeviceAddressInfoKHR_win_to_host(pInfo, &pInfo_host);
convert_VkBufferDeviceAddressInfo_win_to_host(pInfo, &pInfo_host);
result = device->funcs.p_vkGetBufferDeviceAddressKHR(device->device, &pInfo_host);
return result;
......@@ -3903,14 +4054,31 @@ static void WINAPI wine_vkGetBufferMemoryRequirements2KHR(VkDevice device, const
#endif
}
static uint64_t WINAPI wine_vkGetBufferOpaqueCaptureAddressKHR(VkDevice device, const VkBufferDeviceAddressInfoKHR *pInfo)
uint64_t WINAPI wine_vkGetBufferOpaqueCaptureAddress(VkDevice device, const VkBufferDeviceAddressInfo *pInfo)
{
#if defined(USE_STRUCT_CONVERSION)
uint64_t result;
VkBufferDeviceAddressInfo_host pInfo_host;
TRACE("%p, %p\n", device, pInfo);
convert_VkBufferDeviceAddressInfo_win_to_host(pInfo, &pInfo_host);
result = device->funcs.p_vkGetBufferOpaqueCaptureAddress(device->device, &pInfo_host);
return result;
#else
TRACE("%p, %p\n", device, pInfo);
return device->funcs.p_vkGetBufferOpaqueCaptureAddress(device->device, pInfo);
#endif
}
static uint64_t WINAPI wine_vkGetBufferOpaqueCaptureAddressKHR(VkDevice device, const VkBufferDeviceAddressInfo *pInfo)
{
#if defined(USE_STRUCT_CONVERSION)
uint64_t result;
VkBufferDeviceAddressInfoKHR_host pInfo_host;
VkBufferDeviceAddressInfo_host pInfo_host;
TRACE("%p, %p\n", device, pInfo);
convert_VkBufferDeviceAddressInfoKHR_win_to_host(pInfo, &pInfo_host);
convert_VkBufferDeviceAddressInfo_win_to_host(pInfo, &pInfo_host);
result = device->funcs.p_vkGetBufferOpaqueCaptureAddressKHR(device->device, &pInfo_host);
return result;
......@@ -3962,14 +4130,31 @@ void WINAPI wine_vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory mem
device->funcs.p_vkGetDeviceMemoryCommitment(device->device, memory, pCommittedMemoryInBytes);
}
static uint64_t WINAPI wine_vkGetDeviceMemoryOpaqueCaptureAddressKHR(VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfoKHR *pInfo)
uint64_t WINAPI wine_vkGetDeviceMemoryOpaqueCaptureAddress(VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo)
{
#if defined(USE_STRUCT_CONVERSION)
uint64_t result;
VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host pInfo_host;
VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host;
TRACE("%p, %p\n", device, pInfo);
convert_VkDeviceMemoryOpaqueCaptureAddressInfoKHR_win_to_host(pInfo, &pInfo_host);
convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win_to_host(pInfo, &pInfo_host);
result = device->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddress(device->device, &pInfo_host);
return result;
#else
TRACE("%p, %p\n", device, pInfo);
return device->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddress(device->device, pInfo);
#endif
}
static uint64_t WINAPI wine_vkGetDeviceMemoryOpaqueCaptureAddressKHR(VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo)
{
#if defined(USE_STRUCT_CONVERSION)
uint64_t result;
VkDeviceMemoryOpaqueCaptureAddressInfo_host pInfo_host;
TRACE("%p, %p\n", device, pInfo);
convert_VkDeviceMemoryOpaqueCaptureAddressInfo_win_to_host(pInfo, &pInfo_host);
result = device->funcs.p_vkGetDeviceMemoryOpaqueCaptureAddressKHR(device->device, &pInfo_host);
return result;
......@@ -4465,6 +4650,12 @@ void WINAPI wine_vkGetRenderAreaGranularity(VkDevice device, VkRenderPass render
device->funcs.p_vkGetRenderAreaGranularity(device->device, renderPass, pGranularity);
}
VkResult WINAPI wine_vkGetSemaphoreCounterValue(VkDevice device, VkSemaphore semaphore, uint64_t *pValue)
{
TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(semaphore), pValue);
return device->funcs.p_vkGetSemaphoreCounterValue(device->device, semaphore, pValue);
}
static VkResult WINAPI wine_vkGetSemaphoreCounterValueKHR(VkDevice device, VkSemaphore semaphore, uint64_t *pValue)
{
TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(semaphore), pValue);
......@@ -4609,6 +4800,12 @@ VkResult WINAPI wine_vkResetFences(VkDevice device, uint32_t fenceCount, const V
return device->funcs.p_vkResetFences(device->device, fenceCount, pFences);
}
void WINAPI wine_vkResetQueryPool(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount)
{
TRACE("%p, 0x%s, %u, %u\n", device, wine_dbgstr_longlong(queryPool), firstQuery, queryCount);
device->funcs.p_vkResetQueryPool(device->device, queryPool, firstQuery, queryCount);
}
static void WINAPI wine_vkResetQueryPoolEXT(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount)
{
TRACE("%p, 0x%s, %u, %u\n", device, wine_dbgstr_longlong(queryPool), firstQuery, queryCount);
......@@ -4621,14 +4818,31 @@ VkResult WINAPI wine_vkSetEvent(VkDevice device, VkEvent event)
return device->funcs.p_vkSetEvent(device->device, event);
}
static VkResult WINAPI wine_vkSignalSemaphoreKHR(VkDevice device, const VkSemaphoreSignalInfoKHR *pSignalInfo)
VkResult WINAPI wine_vkSignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkResult result;
VkSemaphoreSignalInfoKHR_host pSignalInfo_host;
VkSemaphoreSignalInfo_host pSignalInfo_host;
TRACE("%p, %p\n", device, pSignalInfo);
convert_VkSemaphoreSignalInfoKHR_win_to_host(pSignalInfo, &pSignalInfo_host);
convert_VkSemaphoreSignalInfo_win_to_host(pSignalInfo, &pSignalInfo_host);
result = device->funcs.p_vkSignalSemaphore(device->device, &pSignalInfo_host);
return result;
#else
TRACE("%p, %p\n", device, pSignalInfo);
return device->funcs.p_vkSignalSemaphore(device->device, pSignalInfo);
#endif
}
static VkResult WINAPI wine_vkSignalSemaphoreKHR(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo)
{
#if defined(USE_STRUCT_CONVERSION)
VkResult result;
VkSemaphoreSignalInfo_host pSignalInfo_host;
TRACE("%p, %p\n", device, pSignalInfo);
convert_VkSemaphoreSignalInfo_win_to_host(pSignalInfo, &pSignalInfo_host);
result = device->funcs.p_vkSignalSemaphoreKHR(device->device, &pSignalInfo_host);
return result;
......@@ -4699,7 +4913,13 @@ VkResult WINAPI wine_vkWaitForFences(VkDevice device, uint32_t fenceCount, const
return device->funcs.p_vkWaitForFences(device->device, fenceCount, pFences, waitAll, timeout);
}
static VkResult WINAPI wine_vkWaitSemaphoresKHR(VkDevice device, const VkSemaphoreWaitInfoKHR *pWaitInfo, uint64_t timeout)
VkResult WINAPI wine_vkWaitSemaphores(VkDevice device, const VkSemaphoreWaitInfo *pWaitInfo, uint64_t timeout)
{
TRACE("%p, %p, 0x%s\n", device, pWaitInfo, wine_dbgstr_longlong(timeout));
return device->funcs.p_vkWaitSemaphores(device->device, pWaitInfo, timeout);
}
static VkResult WINAPI wine_vkWaitSemaphoresKHR(VkDevice device, const VkSemaphoreWaitInfo *pWaitInfo, uint64_t timeout)
{
TRACE("%p, %p, 0x%s\n", device, pWaitInfo, wine_dbgstr_longlong(timeout));
return device->funcs.p_vkWaitSemaphoresKHR(device->device, pWaitInfo, timeout);
......@@ -4726,6 +4946,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkCmdBeginQuery", &wine_vkCmdBeginQuery},
{"vkCmdBeginQueryIndexedEXT", &wine_vkCmdBeginQueryIndexedEXT},
{"vkCmdBeginRenderPass", &wine_vkCmdBeginRenderPass},
{"vkCmdBeginRenderPass2", &wine_vkCmdBeginRenderPass2},
{"vkCmdBeginRenderPass2KHR", &wine_vkCmdBeginRenderPass2KHR},
{"vkCmdBeginTransformFeedbackEXT", &wine_vkCmdBeginTransformFeedbackEXT},
{"vkCmdBindDescriptorSets", &wine_vkCmdBindDescriptorSets},
......@@ -4752,10 +4973,12 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkCmdDraw", &wine_vkCmdDraw},
{"vkCmdDrawIndexed", &wine_vkCmdDrawIndexed},
{"vkCmdDrawIndexedIndirect", &wine_vkCmdDrawIndexedIndirect},
{"vkCmdDrawIndexedIndirectCount", &wine_vkCmdDrawIndexedIndirectCount},
{"vkCmdDrawIndexedIndirectCountAMD", &wine_vkCmdDrawIndexedIndirectCountAMD},
{"vkCmdDrawIndexedIndirectCountKHR", &wine_vkCmdDrawIndexedIndirectCountKHR},
{"vkCmdDrawIndirect", &wine_vkCmdDrawIndirect},
{"vkCmdDrawIndirectByteCountEXT", &wine_vkCmdDrawIndirectByteCountEXT},
{"vkCmdDrawIndirectCount", &wine_vkCmdDrawIndirectCount},
{"vkCmdDrawIndirectCountAMD", &wine_vkCmdDrawIndirectCountAMD},
{"vkCmdDrawIndirectCountKHR", &wine_vkCmdDrawIndirectCountKHR},
{"vkCmdDrawMeshTasksIndirectCountNV", &wine_vkCmdDrawMeshTasksIndirectCountNV},
......@@ -4765,11 +4988,13 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkCmdEndQuery", &wine_vkCmdEndQuery},
{"vkCmdEndQueryIndexedEXT", &wine_vkCmdEndQueryIndexedEXT},
{"vkCmdEndRenderPass", &wine_vkCmdEndRenderPass},
{"vkCmdEndRenderPass2", &wine_vkCmdEndRenderPass2},
{"vkCmdEndRenderPass2KHR", &wine_vkCmdEndRenderPass2KHR},
{"vkCmdEndTransformFeedbackEXT", &wine_vkCmdEndTransformFeedbackEXT},
{"vkCmdExecuteCommands", &wine_vkCmdExecuteCommands},
{"vkCmdFillBuffer", &wine_vkCmdFillBuffer},
{"vkCmdNextSubpass", &wine_vkCmdNextSubpass},
{"vkCmdNextSubpass2", &wine_vkCmdNextSubpass2},
{"vkCmdNextSubpass2KHR", &wine_vkCmdNextSubpass2KHR},
{"vkCmdPipelineBarrier", &wine_vkCmdPipelineBarrier},
{"vkCmdPushConstants", &wine_vkCmdPushConstants},
......@@ -4828,6 +5053,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkCreateQueryPool", &wine_vkCreateQueryPool},
{"vkCreateRayTracingPipelinesNV", &wine_vkCreateRayTracingPipelinesNV},
{"vkCreateRenderPass", &wine_vkCreateRenderPass},
{"vkCreateRenderPass2", &wine_vkCreateRenderPass2},
{"vkCreateRenderPass2KHR", &wine_vkCreateRenderPass2KHR},
{"vkCreateSampler", &wine_vkCreateSampler},
{"vkCreateSamplerYcbcrConversion", &wine_vkCreateSamplerYcbcrConversion},
......@@ -4870,11 +5096,13 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkFreeMemory", &wine_vkFreeMemory},
{"vkGetAccelerationStructureHandleNV", &wine_vkGetAccelerationStructureHandleNV},
{"vkGetAccelerationStructureMemoryRequirementsNV", &wine_vkGetAccelerationStructureMemoryRequirementsNV},
{"vkGetBufferDeviceAddress", &wine_vkGetBufferDeviceAddress},
{"vkGetBufferDeviceAddressEXT", &wine_vkGetBufferDeviceAddressEXT},
{"vkGetBufferDeviceAddressKHR", &wine_vkGetBufferDeviceAddressKHR},
{"vkGetBufferMemoryRequirements", &wine_vkGetBufferMemoryRequirements},
{"vkGetBufferMemoryRequirements2", &wine_vkGetBufferMemoryRequirements2},
{"vkGetBufferMemoryRequirements2KHR", &wine_vkGetBufferMemoryRequirements2KHR},
{"vkGetBufferOpaqueCaptureAddress", &wine_vkGetBufferOpaqueCaptureAddress},
{"vkGetBufferOpaqueCaptureAddressKHR", &wine_vkGetBufferOpaqueCaptureAddressKHR},
{"vkGetDescriptorSetLayoutSupport", &wine_vkGetDescriptorSetLayoutSupport},
{"vkGetDescriptorSetLayoutSupportKHR", &wine_vkGetDescriptorSetLayoutSupportKHR},
......@@ -4883,6 +5111,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkGetDeviceGroupPresentCapabilitiesKHR", &wine_vkGetDeviceGroupPresentCapabilitiesKHR},
{"vkGetDeviceGroupSurfacePresentModesKHR", &wine_vkGetDeviceGroupSurfacePresentModesKHR},
{"vkGetDeviceMemoryCommitment", &wine_vkGetDeviceMemoryCommitment},
{"vkGetDeviceMemoryOpaqueCaptureAddress", &wine_vkGetDeviceMemoryOpaqueCaptureAddress},
{"vkGetDeviceMemoryOpaqueCaptureAddressKHR", &wine_vkGetDeviceMemoryOpaqueCaptureAddressKHR},
{"vkGetDeviceProcAddr", &wine_vkGetDeviceProcAddr},
{"vkGetDeviceQueue", &wine_vkGetDeviceQueue},
......@@ -4906,6 +5135,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkGetQueueCheckpointDataNV", &wine_vkGetQueueCheckpointDataNV},
{"vkGetRayTracingShaderGroupHandlesNV", &wine_vkGetRayTracingShaderGroupHandlesNV},
{"vkGetRenderAreaGranularity", &wine_vkGetRenderAreaGranularity},
{"vkGetSemaphoreCounterValue", &wine_vkGetSemaphoreCounterValue},
{"vkGetSemaphoreCounterValueKHR", &wine_vkGetSemaphoreCounterValueKHR},
{"vkGetShaderInfoAMD", &wine_vkGetShaderInfoAMD},
{"vkGetSwapchainImagesKHR", &wine_vkGetSwapchainImagesKHR},
......@@ -4927,8 +5157,10 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkResetDescriptorPool", &wine_vkResetDescriptorPool},
{"vkResetEvent", &wine_vkResetEvent},
{"vkResetFences", &wine_vkResetFences},
{"vkResetQueryPool", &wine_vkResetQueryPool},
{"vkResetQueryPoolEXT", &wine_vkResetQueryPoolEXT},
{"vkSetEvent", &wine_vkSetEvent},
{"vkSignalSemaphore", &wine_vkSignalSemaphore},
{"vkSignalSemaphoreKHR", &wine_vkSignalSemaphoreKHR},
{"vkTrimCommandPool", &wine_vkTrimCommandPool},
{"vkTrimCommandPoolKHR", &wine_vkTrimCommandPoolKHR},
......@@ -4938,6 +5170,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkUpdateDescriptorSetWithTemplateKHR", &wine_vkUpdateDescriptorSetWithTemplateKHR},
{"vkUpdateDescriptorSets", &wine_vkUpdateDescriptorSets},
{"vkWaitForFences", &wine_vkWaitForFences},
{"vkWaitSemaphores", &wine_vkWaitSemaphores},
{"vkWaitSemaphoresKHR", &wine_vkWaitSemaphoresKHR},
};
......@@ -5125,6 +5358,7 @@ static const char * const vk_device_extensions[] =
"VK_KHR_shader_draw_parameters",
"VK_KHR_shader_float16_int8",
"VK_KHR_shader_float_controls",
"VK_KHR_shader_non_semantic_info",
"VK_KHR_shader_subgroup_extended_types",
"VK_KHR_spirv_1_4",
"VK_KHR_storage_buffer_storage_class",
......@@ -5159,6 +5393,7 @@ static const char * const vk_device_extensions[] =
"VK_NV_shading_rate_image",
"VK_NV_viewport_array2",
"VK_NV_viewport_swizzle",
"VK_QCOM_render_pass_transform",
};
static const char * const vk_instance_extensions[] =
......
dlls/winevulkan/vulkan_thunks.h
View file @ 7b1622d1
......@@ -3,7 +3,7 @@
* This file is generated from Vulkan vk.xml file covered
* by the following copyright and permission notice:
*
* Copyright (c) 2015-2019 The Khronos Group Inc.
* Copyright (c) 2015-2020 The Khronos Group Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -38,7 +38,7 @@
#ifndef __WINE_VULKAN_THUNKS_H
#define __WINE_VULKAN_THUNKS_H
#define WINE_VK_VERSION VK_API_VERSION_1_1
#define WINE_VK_VERSION VK_API_VERSION_1_2
/* Functions for which we have custom implementations outside of the thunks. */
VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers);
......@@ -508,12 +508,12 @@ typedef struct VkMemoryRequirements2KHR_host
VkMemoryRequirements_host memoryRequirements;
} VkMemoryRequirements2KHR_host;
typedef struct VkBufferDeviceAddressInfoKHR_host
typedef struct VkBufferDeviceAddressInfo_host
{
VkStructureType sType;
const void *pNext;
VkBuffer buffer;
} VkBufferDeviceAddressInfoKHR_host;
} VkBufferDeviceAddressInfo_host;
typedef struct VkBufferMemoryRequirementsInfo2_host
{
......@@ -529,12 +529,12 @@ typedef struct VkMemoryRequirements2_host
VkMemoryRequirements_host memoryRequirements;
} VkMemoryRequirements2_host;
typedef struct VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host
typedef struct VkDeviceMemoryOpaqueCaptureAddressInfo_host
{
VkStructureType sType;
const void *pNext;
VkDeviceMemory memory;
} VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host;
} VkDeviceMemoryOpaqueCaptureAddressInfo_host;
typedef struct VkImageMemoryRequirementsInfo2_host
{
......@@ -797,13 +797,13 @@ typedef struct VkBindSparseInfo_host
const VkSemaphore *pSignalSemaphores;
} VkBindSparseInfo_host;
typedef struct VkSemaphoreSignalInfoKHR_host
typedef struct VkSemaphoreSignalInfo_host
{
VkStructureType sType;
const void *pNext;
VkSemaphore semaphore;
uint64_t value;
} VkSemaphoreSignalInfoKHR_host;
} VkSemaphoreSignalInfo_host;
typedef struct VkCopyDescriptorSet_host
{
......@@ -899,9 +899,14 @@ struct vulkan_device_funcs
void (*p_vkCmdBeginRenderPass)(VkCommandBuffer, const VkRenderPassBeginInfo *, VkSubpassContents);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdBeginRenderPass2KHR)(VkCommandBuffer, const VkRenderPassBeginInfo_host *, const VkSubpassBeginInfoKHR *);
void (*p_vkCmdBeginRenderPass2)(VkCommandBuffer, const VkRenderPassBeginInfo_host *, const VkSubpassBeginInfo *);
#else
void (*p_vkCmdBeginRenderPass2KHR)(VkCommandBuffer, const VkRenderPassBeginInfo *, const VkSubpassBeginInfoKHR *);
void (*p_vkCmdBeginRenderPass2)(VkCommandBuffer, const VkRenderPassBeginInfo *, const VkSubpassBeginInfo *);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdBeginRenderPass2KHR)(VkCommandBuffer, const VkRenderPassBeginInfo_host *, const VkSubpassBeginInfo *);
#else
void (*p_vkCmdBeginRenderPass2KHR)(VkCommandBuffer, const VkRenderPassBeginInfo *, const VkSubpassBeginInfo *);
#endif
void (*p_vkCmdBeginTransformFeedbackEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *);
void (*p_vkCmdBindDescriptorSets)(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, uint32_t, uint32_t, const VkDescriptorSet *, uint32_t, const uint32_t *);
......@@ -944,10 +949,12 @@ struct vulkan_device_funcs
void (*p_vkCmdDraw)(VkCommandBuffer, uint32_t, uint32_t, uint32_t, uint32_t);
void (*p_vkCmdDrawIndexed)(VkCommandBuffer, uint32_t, uint32_t, uint32_t, int32_t, uint32_t);
void (*p_vkCmdDrawIndexedIndirect)(VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawIndexedIndirectCount)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawIndexedIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawIndexedIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawIndirect)(VkCommandBuffer, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawIndirectByteCountEXT)(VkCommandBuffer, uint32_t, uint32_t, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawIndirectCount)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawIndirectCountAMD)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawIndirectCountKHR)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
void (*p_vkCmdDrawMeshTasksIndirectCountNV)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkBuffer, VkDeviceSize, uint32_t, uint32_t);
......@@ -957,12 +964,14 @@ struct vulkan_device_funcs
void (*p_vkCmdEndQuery)(VkCommandBuffer, VkQueryPool, uint32_t);
void (*p_vkCmdEndQueryIndexedEXT)(VkCommandBuffer, VkQueryPool, uint32_t, uint32_t);
void (*p_vkCmdEndRenderPass)(VkCommandBuffer);
void (*p_vkCmdEndRenderPass2KHR)(VkCommandBuffer, const VkSubpassEndInfoKHR *);
void (*p_vkCmdEndRenderPass2)(VkCommandBuffer, const VkSubpassEndInfo *);
void (*p_vkCmdEndRenderPass2KHR)(VkCommandBuffer, const VkSubpassEndInfo *);
void (*p_vkCmdEndTransformFeedbackEXT)(VkCommandBuffer, uint32_t, uint32_t, const VkBuffer *, const VkDeviceSize *);
void (*p_vkCmdExecuteCommands)(VkCommandBuffer, uint32_t, const VkCommandBuffer *);
void (*p_vkCmdFillBuffer)(VkCommandBuffer, VkBuffer, VkDeviceSize, VkDeviceSize, uint32_t);
void (*p_vkCmdNextSubpass)(VkCommandBuffer, VkSubpassContents);
void (*p_vkCmdNextSubpass2KHR)(VkCommandBuffer, const VkSubpassBeginInfoKHR *, const VkSubpassEndInfoKHR *);
void (*p_vkCmdNextSubpass2)(VkCommandBuffer, const VkSubpassBeginInfo *, const VkSubpassEndInfo *);
void (*p_vkCmdNextSubpass2KHR)(VkCommandBuffer, const VkSubpassBeginInfo *, const VkSubpassEndInfo *);
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkCmdPipelineBarrier)(VkCommandBuffer, VkPipelineStageFlags, VkPipelineStageFlags, VkDependencyFlags, uint32_t, const VkMemoryBarrier *, uint32_t, const VkBufferMemoryBarrier_host *, uint32_t, const VkImageMemoryBarrier_host *);
#else
......@@ -1080,7 +1089,8 @@ struct vulkan_device_funcs
VkResult (*p_vkCreateRayTracingPipelinesNV)(VkDevice, VkPipelineCache, uint32_t, const VkRayTracingPipelineCreateInfoNV *, const VkAllocationCallbacks *, VkPipeline *);
#endif
VkResult (*p_vkCreateRenderPass)(VkDevice, const VkRenderPassCreateInfo *, const VkAllocationCallbacks *, VkRenderPass *);
VkResult (*p_vkCreateRenderPass2KHR)(VkDevice, const VkRenderPassCreateInfo2KHR *, const VkAllocationCallbacks *, VkRenderPass *);
VkResult (*p_vkCreateRenderPass2)(VkDevice, const VkRenderPassCreateInfo2 *, const VkAllocationCallbacks *, VkRenderPass *);
VkResult (*p_vkCreateRenderPass2KHR)(VkDevice, const VkRenderPassCreateInfo2 *, const VkAllocationCallbacks *, VkRenderPass *);
VkResult (*p_vkCreateSampler)(VkDevice, const VkSamplerCreateInfo *, const VkAllocationCallbacks *, VkSampler *);
VkResult (*p_vkCreateSamplerYcbcrConversion)(VkDevice, const VkSamplerYcbcrConversionCreateInfo *, const VkAllocationCallbacks *, VkSamplerYcbcrConversion *);
VkResult (*p_vkCreateSamplerYcbcrConversionKHR)(VkDevice, const VkSamplerYcbcrConversionCreateInfo *, const VkAllocationCallbacks *, VkSamplerYcbcrConversion *);
......@@ -1135,14 +1145,19 @@ struct vulkan_device_funcs
void (*p_vkGetAccelerationStructureMemoryRequirementsNV)(VkDevice, const VkAccelerationStructureMemoryRequirementsInfoNV *, VkMemoryRequirements2KHR *);
#endif
#if defined(USE_STRUCT_CONVERSION)
VkDeviceAddress (*p_vkGetBufferDeviceAddressEXT)(VkDevice, const VkBufferDeviceAddressInfoKHR_host *);
VkDeviceAddress (*p_vkGetBufferDeviceAddress)(VkDevice, const VkBufferDeviceAddressInfo_host *);
#else
VkDeviceAddress (*p_vkGetBufferDeviceAddress)(VkDevice, const VkBufferDeviceAddressInfo *);
#endif
#if defined(USE_STRUCT_CONVERSION)
VkDeviceAddress (*p_vkGetBufferDeviceAddressEXT)(VkDevice, const VkBufferDeviceAddressInfo_host *);
#else
VkDeviceAddress (*p_vkGetBufferDeviceAddressEXT)(VkDevice, const VkBufferDeviceAddressInfoKHR *);
VkDeviceAddress (*p_vkGetBufferDeviceAddressEXT)(VkDevice, const VkBufferDeviceAddressInfo *);
#endif
#if defined(USE_STRUCT_CONVERSION)
VkDeviceAddress (*p_vkGetBufferDeviceAddressKHR)(VkDevice, const VkBufferDeviceAddressInfoKHR_host *);
VkDeviceAddress (*p_vkGetBufferDeviceAddressKHR)(VkDevice, const VkBufferDeviceAddressInfo_host *);
#else
VkDeviceAddress (*p_vkGetBufferDeviceAddressKHR)(VkDevice, const VkBufferDeviceAddressInfoKHR *);
VkDeviceAddress (*p_vkGetBufferDeviceAddressKHR)(VkDevice, const VkBufferDeviceAddressInfo *);
#endif
#if defined(USE_STRUCT_CONVERSION)
void (*p_vkGetBufferMemoryRequirements)(VkDevice, VkBuffer, VkMemoryRequirements_host *);
......@@ -1160,9 +1175,14 @@ struct vulkan_device_funcs
void (*p_vkGetBufferMemoryRequirements2KHR)(VkDevice, const VkBufferMemoryRequirementsInfo2 *, VkMemoryRequirements2 *);
#endif
#if defined(USE_STRUCT_CONVERSION)
uint64_t (*p_vkGetBufferOpaqueCaptureAddressKHR)(VkDevice, const VkBufferDeviceAddressInfoKHR_host *);
uint64_t (*p_vkGetBufferOpaqueCaptureAddress)(VkDevice, const VkBufferDeviceAddressInfo_host *);
#else
uint64_t (*p_vkGetBufferOpaqueCaptureAddressKHR)(VkDevice, const VkBufferDeviceAddressInfoKHR *);
uint64_t (*p_vkGetBufferOpaqueCaptureAddress)(VkDevice, const VkBufferDeviceAddressInfo *);
#endif
#if defined(USE_STRUCT_CONVERSION)
uint64_t (*p_vkGetBufferOpaqueCaptureAddressKHR)(VkDevice, const VkBufferDeviceAddressInfo_host *);
#else
uint64_t (*p_vkGetBufferOpaqueCaptureAddressKHR)(VkDevice, const VkBufferDeviceAddressInfo *);
#endif
void (*p_vkGetDescriptorSetLayoutSupport)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, VkDescriptorSetLayoutSupport *);
void (*p_vkGetDescriptorSetLayoutSupportKHR)(VkDevice, const VkDescriptorSetLayoutCreateInfo *, VkDescriptorSetLayoutSupport *);
......@@ -1172,9 +1192,14 @@ struct vulkan_device_funcs
VkResult (*p_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *);
void (*p_vkGetDeviceMemoryCommitment)(VkDevice, VkDeviceMemory, VkDeviceSize *);
#if defined(USE_STRUCT_CONVERSION)
uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddressKHR)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfoKHR_host *);
uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddress)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfo_host *);
#else
uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddress)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfo *);
#endif
#if defined(USE_STRUCT_CONVERSION)
uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddressKHR)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfo_host *);
#else
uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddressKHR)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfoKHR *);
uint64_t (*p_vkGetDeviceMemoryOpaqueCaptureAddressKHR)(VkDevice, const VkDeviceMemoryOpaqueCaptureAddressInfo *);
#endif
void (*p_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *);
void (*p_vkGetDeviceQueue2)(VkDevice, const VkDeviceQueueInfo2 *, VkQueue *);
......@@ -1233,6 +1258,7 @@ struct vulkan_device_funcs
void (*p_vkGetQueueCheckpointDataNV)(VkQueue, uint32_t *, VkCheckpointDataNV *);
VkResult (*p_vkGetRayTracingShaderGroupHandlesNV)(VkDevice, VkPipeline, uint32_t, uint32_t, size_t, void *);
void (*p_vkGetRenderAreaGranularity)(VkDevice, VkRenderPass, VkExtent2D *);
VkResult (*p_vkGetSemaphoreCounterValue)(VkDevice, VkSemaphore, uint64_t *);
VkResult (*p_vkGetSemaphoreCounterValueKHR)(VkDevice, VkSemaphore, uint64_t *);
VkResult (*p_vkGetShaderInfoAMD)(VkDevice, VkPipeline, VkShaderStageFlagBits, VkShaderInfoTypeAMD, size_t *, void *);
VkResult (*p_vkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *);
......@@ -1262,12 +1288,18 @@ struct vulkan_device_funcs
VkResult (*p_vkResetDescriptorPool)(VkDevice, VkDescriptorPool, VkDescriptorPoolResetFlags);
VkResult (*p_vkResetEvent)(VkDevice, VkEvent);
VkResult (*p_vkResetFences)(VkDevice, uint32_t, const VkFence *);
void (*p_vkResetQueryPool)(VkDevice, VkQueryPool, uint32_t, uint32_t);
void (*p_vkResetQueryPoolEXT)(VkDevice, VkQueryPool, uint32_t, uint32_t);
VkResult (*p_vkSetEvent)(VkDevice, VkEvent);
#if defined(USE_STRUCT_CONVERSION)
VkResult (*p_vkSignalSemaphoreKHR)(VkDevice, const VkSemaphoreSignalInfoKHR_host *);
VkResult (*p_vkSignalSemaphore)(VkDevice, const VkSemaphoreSignalInfo_host *);
#else
VkResult (*p_vkSignalSemaphore)(VkDevice, const VkSemaphoreSignalInfo *);
#endif
#if defined(USE_STRUCT_CONVERSION)
VkResult (*p_vkSignalSemaphoreKHR)(VkDevice, const VkSemaphoreSignalInfo_host *);
#else
VkResult (*p_vkSignalSemaphoreKHR)(VkDevice, const VkSemaphoreSignalInfoKHR *);
VkResult (*p_vkSignalSemaphoreKHR)(VkDevice, const VkSemaphoreSignalInfo *);
#endif
void (*p_vkTrimCommandPool)(VkDevice, VkCommandPool, VkCommandPoolTrimFlags);
void (*p_vkTrimCommandPoolKHR)(VkDevice, VkCommandPool, VkCommandPoolTrimFlags);
......@@ -1281,7 +1313,8 @@ struct vulkan_device_funcs
void (*p_vkUpdateDescriptorSets)(VkDevice, uint32_t, const VkWriteDescriptorSet *, uint32_t, const VkCopyDescriptorSet *);
#endif
VkResult (*p_vkWaitForFences)(VkDevice, uint32_t, const VkFence *, VkBool32, uint64_t);
VkResult (*p_vkWaitSemaphoresKHR)(VkDevice, const VkSemaphoreWaitInfoKHR *, uint64_t);
VkResult (*p_vkWaitSemaphores)(VkDevice, const VkSemaphoreWaitInfo *, uint64_t);
VkResult (*p_vkWaitSemaphoresKHR)(VkDevice, const VkSemaphoreWaitInfo *, uint64_t);
};
/* For use by vkInstance and children */
......@@ -1387,6 +1420,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkCmdBeginQuery) \
USE_VK_FUNC(vkCmdBeginQueryIndexedEXT) \
USE_VK_FUNC(vkCmdBeginRenderPass) \
USE_VK_FUNC(vkCmdBeginRenderPass2) \
USE_VK_FUNC(vkCmdBeginRenderPass2KHR) \
USE_VK_FUNC(vkCmdBeginTransformFeedbackEXT) \
USE_VK_FUNC(vkCmdBindDescriptorSets) \
......@@ -1413,10 +1447,12 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkCmdDraw) \
USE_VK_FUNC(vkCmdDrawIndexed) \
USE_VK_FUNC(vkCmdDrawIndexedIndirect) \
USE_VK_FUNC(vkCmdDrawIndexedIndirectCount) \
USE_VK_FUNC(vkCmdDrawIndexedIndirectCountAMD) \
USE_VK_FUNC(vkCmdDrawIndexedIndirectCountKHR) \
USE_VK_FUNC(vkCmdDrawIndirect) \
USE_VK_FUNC(vkCmdDrawIndirectByteCountEXT) \
USE_VK_FUNC(vkCmdDrawIndirectCount) \
USE_VK_FUNC(vkCmdDrawIndirectCountAMD) \
USE_VK_FUNC(vkCmdDrawIndirectCountKHR) \
USE_VK_FUNC(vkCmdDrawMeshTasksIndirectCountNV) \
......@@ -1426,11 +1462,13 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkCmdEndQuery) \
USE_VK_FUNC(vkCmdEndQueryIndexedEXT) \
USE_VK_FUNC(vkCmdEndRenderPass) \
USE_VK_FUNC(vkCmdEndRenderPass2) \
USE_VK_FUNC(vkCmdEndRenderPass2KHR) \
USE_VK_FUNC(vkCmdEndTransformFeedbackEXT) \
USE_VK_FUNC(vkCmdExecuteCommands) \
USE_VK_FUNC(vkCmdFillBuffer) \
USE_VK_FUNC(vkCmdNextSubpass) \
USE_VK_FUNC(vkCmdNextSubpass2) \
USE_VK_FUNC(vkCmdNextSubpass2KHR) \
USE_VK_FUNC(vkCmdPipelineBarrier) \
USE_VK_FUNC(vkCmdPushConstants) \
......@@ -1489,6 +1527,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkCreateQueryPool) \
USE_VK_FUNC(vkCreateRayTracingPipelinesNV) \
USE_VK_FUNC(vkCreateRenderPass) \
USE_VK_FUNC(vkCreateRenderPass2) \
USE_VK_FUNC(vkCreateRenderPass2KHR) \
USE_VK_FUNC(vkCreateSampler) \
USE_VK_FUNC(vkCreateSamplerYcbcrConversion) \
......@@ -1531,11 +1570,13 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkFreeMemory) \
USE_VK_FUNC(vkGetAccelerationStructureHandleNV) \
USE_VK_FUNC(vkGetAccelerationStructureMemoryRequirementsNV) \
USE_VK_FUNC(vkGetBufferDeviceAddress) \
USE_VK_FUNC(vkGetBufferDeviceAddressEXT) \
USE_VK_FUNC(vkGetBufferDeviceAddressKHR) \
USE_VK_FUNC(vkGetBufferMemoryRequirements) \
USE_VK_FUNC(vkGetBufferMemoryRequirements2) \
USE_VK_FUNC(vkGetBufferMemoryRequirements2KHR) \
USE_VK_FUNC(vkGetBufferOpaqueCaptureAddress) \
USE_VK_FUNC(vkGetBufferOpaqueCaptureAddressKHR) \
USE_VK_FUNC(vkGetDescriptorSetLayoutSupport) \
USE_VK_FUNC(vkGetDescriptorSetLayoutSupportKHR) \
......@@ -1544,6 +1585,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkGetDeviceGroupPresentCapabilitiesKHR) \
USE_VK_FUNC(vkGetDeviceGroupSurfacePresentModesKHR) \
USE_VK_FUNC(vkGetDeviceMemoryCommitment) \
USE_VK_FUNC(vkGetDeviceMemoryOpaqueCaptureAddress) \
USE_VK_FUNC(vkGetDeviceMemoryOpaqueCaptureAddressKHR) \
USE_VK_FUNC(vkGetDeviceQueue) \
USE_VK_FUNC(vkGetDeviceQueue2) \
......@@ -1566,6 +1608,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkGetQueueCheckpointDataNV) \
USE_VK_FUNC(vkGetRayTracingShaderGroupHandlesNV) \
USE_VK_FUNC(vkGetRenderAreaGranularity) \
USE_VK_FUNC(vkGetSemaphoreCounterValue) \
USE_VK_FUNC(vkGetSemaphoreCounterValueKHR) \
USE_VK_FUNC(vkGetShaderInfoAMD) \
USE_VK_FUNC(vkGetSwapchainImagesKHR) \
......@@ -1587,8 +1630,10 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkResetDescriptorPool) \
USE_VK_FUNC(vkResetEvent) \
USE_VK_FUNC(vkResetFences) \
USE_VK_FUNC(vkResetQueryPool) \
USE_VK_FUNC(vkResetQueryPoolEXT) \
USE_VK_FUNC(vkSetEvent) \
USE_VK_FUNC(vkSignalSemaphore) \
USE_VK_FUNC(vkSignalSemaphoreKHR) \
USE_VK_FUNC(vkTrimCommandPool) \
USE_VK_FUNC(vkTrimCommandPoolKHR) \
......@@ -1598,6 +1643,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkUpdateDescriptorSetWithTemplateKHR) \
USE_VK_FUNC(vkUpdateDescriptorSets) \
USE_VK_FUNC(vkWaitForFences) \
USE_VK_FUNC(vkWaitSemaphores) \
USE_VK_FUNC(vkWaitSemaphoresKHR)
#define ALL_VK_INSTANCE_FUNCS() \
......
dlls/winevulkan/winevulkan.spec
View file @ 7b1622d1
......@@ -3,7 +3,7 @@
# This file is generated from Vulkan vk.xml file covered
# by the following copyright and permission notice:
#
# Copyright (c) 2015-2019 The Khronos Group Inc.
# Copyright (c) 2015-2020 The Khronos Group Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
......@@ -49,6 +49,7 @@
@ stdcall -private wine_vkBindImageMemory2(ptr long ptr)
@ stdcall -private wine_vkCmdBeginQuery(ptr int64 long long)
@ stdcall -private wine_vkCmdBeginRenderPass(ptr ptr long)
@ stdcall -private wine_vkCmdBeginRenderPass2(ptr ptr ptr)
@ stdcall -private wine_vkCmdBindDescriptorSets(ptr long int64 long long ptr long ptr)
@ stdcall -private wine_vkCmdBindIndexBuffer(ptr int64 int64 long)
@ stdcall -private wine_vkCmdBindPipeline(ptr long int64)
......@@ -68,12 +69,16 @@
@ stdcall -private wine_vkCmdDraw(ptr long long long long)
@ stdcall -private wine_vkCmdDrawIndexed(ptr long long long long long)
@ stdcall -private wine_vkCmdDrawIndexedIndirect(ptr int64 int64 long long)
@ stdcall -private wine_vkCmdDrawIndexedIndirectCount(ptr int64 int64 int64 int64 long long)
@ stdcall -private wine_vkCmdDrawIndirect(ptr int64 int64 long long)
@ stdcall -private wine_vkCmdDrawIndirectCount(ptr int64 int64 int64 int64 long long)
@ stdcall -private wine_vkCmdEndQuery(ptr int64 long)
@ stdcall -private wine_vkCmdEndRenderPass(ptr)
@ stdcall -private wine_vkCmdEndRenderPass2(ptr ptr)
@ stdcall -private wine_vkCmdExecuteCommands(ptr long ptr)
@ stdcall -private wine_vkCmdFillBuffer(ptr int64 int64 int64 long)
@ stdcall -private wine_vkCmdNextSubpass(ptr long)
@ stdcall -private wine_vkCmdNextSubpass2(ptr ptr ptr)
@ stdcall -private wine_vkCmdPipelineBarrier(ptr long long long long ptr long ptr long ptr)
@ stdcall -private wine_vkCmdPushConstants(ptr int64 long long long ptr)
@ stdcall -private wine_vkCmdResetEvent(ptr int64 long)
......@@ -114,6 +119,7 @@
@ stdcall -private wine_vkCreatePipelineLayout(ptr ptr ptr ptr)
@ stdcall -private wine_vkCreateQueryPool(ptr ptr ptr ptr)
@ stdcall -private wine_vkCreateRenderPass(ptr ptr ptr ptr)
@ stdcall -private wine_vkCreateRenderPass2(ptr ptr ptr ptr)
@ stdcall -private wine_vkCreateSampler(ptr ptr ptr ptr)
@ stdcall -private wine_vkCreateSamplerYcbcrConversion(ptr ptr ptr ptr)
@ stdcall -private wine_vkCreateSemaphore(ptr ptr ptr ptr)
......@@ -158,13 +164,16 @@
@ stdcall -private wine_vkFreeCommandBuffers(ptr int64 long ptr)
@ stdcall -private wine_vkFreeDescriptorSets(ptr int64 long ptr)
@ stdcall -private wine_vkFreeMemory(ptr int64 ptr)
@ stdcall -private wine_vkGetBufferDeviceAddress(ptr ptr)
@ stdcall -private wine_vkGetBufferMemoryRequirements(ptr int64 ptr)
@ stdcall -private wine_vkGetBufferMemoryRequirements2(ptr ptr ptr)
@ stdcall -private wine_vkGetBufferOpaqueCaptureAddress(ptr ptr)
@ stdcall -private wine_vkGetDescriptorSetLayoutSupport(ptr ptr ptr)
@ stdcall -private wine_vkGetDeviceGroupPeerMemoryFeatures(ptr long long long ptr)
@ stdcall -private wine_vkGetDeviceGroupPresentCapabilitiesKHR(ptr ptr)
@ stdcall -private wine_vkGetDeviceGroupSurfacePresentModesKHR(ptr int64 ptr)
@ stdcall -private wine_vkGetDeviceMemoryCommitment(ptr int64 ptr)
@ stdcall -private wine_vkGetDeviceMemoryOpaqueCaptureAddress(ptr ptr)
@ stdcall -private wine_vkGetDeviceProcAddr(ptr str)
@ stdcall -private wine_vkGetDeviceQueue(ptr long long ptr)
@ stdcall -private wine_vkGetDeviceQueue2(ptr ptr ptr)
......@@ -207,6 +216,7 @@
@ stdcall -private wine_vkGetPipelineCacheData(ptr int64 ptr ptr)
@ stdcall -private wine_vkGetQueryPoolResults(ptr int64 long long long ptr int64 long)
@ stdcall -private wine_vkGetRenderAreaGranularity(ptr int64 ptr)
@ stdcall -private wine_vkGetSemaphoreCounterValue(ptr int64 ptr)
@ stdcall -private wine_vkGetSwapchainImagesKHR(ptr int64 ptr ptr)
@ stdcall -private wine_vkInvalidateMappedMemoryRanges(ptr long ptr)
@ stdcall -private wine_vkMapMemory(ptr int64 int64 int64 long ptr)
......@@ -220,9 +230,12 @@
@ stdcall -private wine_vkResetDescriptorPool(ptr int64 long)
@ stdcall -private wine_vkResetEvent(ptr int64)
@ stdcall -private wine_vkResetFences(ptr long ptr)
@ stdcall -private wine_vkResetQueryPool(ptr int64 long long)
@ stdcall -private wine_vkSetEvent(ptr int64)
@ stdcall -private wine_vkSignalSemaphore(ptr ptr)
@ stdcall -private wine_vkTrimCommandPool(ptr int64 long)
@ stdcall -private wine_vkUnmapMemory(ptr int64)
@ stdcall -private wine_vkUpdateDescriptorSetWithTemplate(ptr int64 int64 ptr)
@ stdcall -private wine_vkUpdateDescriptorSets(ptr long ptr long ptr)
@ stdcall -private wine_vkWaitForFences(ptr long ptr long int64)
@ stdcall -private wine_vkWaitSemaphores(ptr ptr int64)
include/wine/vulkan.h
View file @ 7b1622d1
This source diff could not be displayed because it is too large. You can view the blob instead.
include/wine/vulkan_driver.h
View file @ 7b1622d1
......@@ -3,7 +3,7 @@
* This file is generated from Vulkan vk.xml file covered
* by the following copyright and permission notice:
*
* Copyright (c) 2015-2019 The Khronos Group Inc.
* Copyright (c) 2015-2020 The Khronos Group Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment