Skip to content

W
wine-winehq
Commit ea890c47 authored by Georg Lehmann's avatar Georg Lehmann Committed by Alexandre Julliard
Browse files
Options

winevulkan: Update to VK spec version 1.3.277.

parent db03d2be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 8 deletions
dlls/vulkan-1/vulkan-1.spec
View file @ ea890c47
......@@ -3,7 +3,7 @@
# This file is generated from Vulkan vk.xml file covered
# by the following copyright and permission notice:
#
# Copyright 2015-2023 The Khronos Group Inc.
# Copyright 2015-2024 The Khronos Group Inc.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
......
dlls/winevulkan/loader_thunks.h
View file @ ea890c47
......@@ -3,7 +3,7 @@
* This file is generated from Vulkan vk.xml file covered
* by the following copyright and permission notice:
*
* Copyright 2015-2023 The Khronos Group Inc.
* Copyright 2015-2024 The Khronos Group Inc.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
......@@ -45,9 +45,11 @@ enum unix_call
unix_vkCmdBeginRendering,
unix_vkCmdBeginRenderingKHR,
unix_vkCmdBeginTransformFeedbackEXT,
unix_vkCmdBindDescriptorBufferEmbeddedSamplers2EXT,
unix_vkCmdBindDescriptorBufferEmbeddedSamplersEXT,
unix_vkCmdBindDescriptorBuffersEXT,
unix_vkCmdBindDescriptorSets,
unix_vkCmdBindDescriptorSets2KHR,
unix_vkCmdBindIndexBuffer,
unix_vkCmdBindIndexBuffer2KHR,
unix_vkCmdBindInvocationMaskHUAWEI,
......@@ -146,7 +148,10 @@ enum unix_call
unix_vkCmdPipelineBarrier2KHR,
unix_vkCmdPreprocessGeneratedCommandsNV,
unix_vkCmdPushConstants,
unix_vkCmdPushConstants2KHR,
unix_vkCmdPushDescriptorSet2KHR,
unix_vkCmdPushDescriptorSetKHR,
unix_vkCmdPushDescriptorSetWithTemplate2KHR,
unix_vkCmdPushDescriptorSetWithTemplateKHR,
unix_vkCmdResetEvent,
unix_vkCmdResetEvent2,
......@@ -191,6 +196,7 @@ enum unix_call
unix_vkCmdSetDepthTestEnableEXT,
unix_vkCmdSetDepthWriteEnable,
unix_vkCmdSetDepthWriteEnableEXT,
unix_vkCmdSetDescriptorBufferOffsets2EXT,
unix_vkCmdSetDescriptorBufferOffsetsEXT,
unix_vkCmdSetDeviceMask,
unix_vkCmdSetDeviceMaskKHR,
......@@ -210,6 +216,7 @@ enum unix_call
unix_vkCmdSetLineRasterizationModeEXT,
unix_vkCmdSetLineStippleEXT,
unix_vkCmdSetLineStippleEnableEXT,
unix_vkCmdSetLineStippleKHR,
unix_vkCmdSetLineWidth,
unix_vkCmdSetLogicOpEXT,
unix_vkCmdSetLogicOpEnableEXT,
......@@ -228,6 +235,8 @@ enum unix_call
unix_vkCmdSetRasterizerDiscardEnable,
unix_vkCmdSetRasterizerDiscardEnableEXT,
unix_vkCmdSetRayTracingPipelineStackSizeKHR,
unix_vkCmdSetRenderingAttachmentLocationsKHR,
unix_vkCmdSetRenderingInputAttachmentIndicesKHR,
unix_vkCmdSetRepresentativeFragmentTestEnableNV,
unix_vkCmdSetSampleLocationsEXT,
unix_vkCmdSetSampleLocationsEnableEXT,
......@@ -402,6 +411,7 @@ enum unix_call
unix_vkGetBufferOpaqueCaptureAddressKHR,
unix_vkGetBufferOpaqueCaptureDescriptorDataEXT,
unix_vkGetCalibratedTimestampsEXT,
unix_vkGetCalibratedTimestampsKHR,
unix_vkGetCudaModuleCacheNV,
unix_vkGetDeferredOperationMaxConcurrencyKHR,
unix_vkGetDeferredOperationResultKHR,
......@@ -455,6 +465,7 @@ enum unix_call
unix_vkGetMicromapBuildSizesEXT,
unix_vkGetPerformanceParameterINTEL,
unix_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT,
unix_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR,
unix_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR,
unix_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV,
unix_vkGetPhysicalDeviceExternalBufferProperties,
......@@ -808,6 +819,12 @@ struct vkCmdBeginTransformFeedbackEXT_params
const VkDeviceSize *pCounterBufferOffsets;
};
struct vkCmdBindDescriptorBufferEmbeddedSamplers2EXT_params
{
VkCommandBuffer commandBuffer;
const VkBindDescriptorBufferEmbeddedSamplersInfoEXT *pBindDescriptorBufferEmbeddedSamplersInfo;
};
struct vkCmdBindDescriptorBufferEmbeddedSamplersEXT_params
{
VkCommandBuffer commandBuffer;
......@@ -835,6 +852,12 @@ struct vkCmdBindDescriptorSets_params
const uint32_t *pDynamicOffsets;
};
struct vkCmdBindDescriptorSets2KHR_params
{
VkCommandBuffer commandBuffer;
const VkBindDescriptorSetsInfoKHR *pBindDescriptorSetsInfo;
};
struct vkCmdBindIndexBuffer_params
{
VkCommandBuffer commandBuffer;
......@@ -1629,6 +1652,18 @@ struct vkCmdPushConstants_params
const void *pValues;
};
struct vkCmdPushConstants2KHR_params
{
VkCommandBuffer commandBuffer;
const VkPushConstantsInfoKHR *pPushConstantsInfo;
};
struct vkCmdPushDescriptorSet2KHR_params
{
VkCommandBuffer commandBuffer;
const VkPushDescriptorSetInfoKHR *pPushDescriptorSetInfo;
};
struct vkCmdPushDescriptorSetKHR_params
{
VkCommandBuffer commandBuffer;
......@@ -1639,6 +1674,12 @@ struct vkCmdPushDescriptorSetKHR_params
const VkWriteDescriptorSet *pDescriptorWrites;
};
struct vkCmdPushDescriptorSetWithTemplate2KHR_params
{
VkCommandBuffer commandBuffer;
const VkPushDescriptorSetWithTemplateInfoKHR *pPushDescriptorSetWithTemplateInfo;
};
struct vkCmdPushDescriptorSetWithTemplateKHR_params
{
VkCommandBuffer commandBuffer;
......@@ -1931,6 +1972,12 @@ struct vkCmdSetDepthWriteEnableEXT_params
VkBool32 depthWriteEnable;
};
struct vkCmdSetDescriptorBufferOffsets2EXT_params
{
VkCommandBuffer commandBuffer;
const VkSetDescriptorBufferOffsetsInfoEXT *pSetDescriptorBufferOffsetsInfo;
};
struct vkCmdSetDescriptorBufferOffsetsEXT_params
{
VkCommandBuffer commandBuffer;
......@@ -2062,6 +2109,13 @@ struct vkCmdSetLineStippleEnableEXT_params
VkBool32 stippledLineEnable;
};
struct vkCmdSetLineStippleKHR_params
{
VkCommandBuffer commandBuffer;
uint32_t lineStippleFactor;
uint16_t lineStipplePattern;
};
struct vkCmdSetLineWidth_params
{
VkCommandBuffer commandBuffer;
......@@ -2173,6 +2227,18 @@ struct vkCmdSetRayTracingPipelineStackSizeKHR_params
uint32_t pipelineStackSize;
};
struct vkCmdSetRenderingAttachmentLocationsKHR_params
{
VkCommandBuffer commandBuffer;
const VkRenderingAttachmentLocationInfoKHR *pLocationInfo;
};
struct vkCmdSetRenderingInputAttachmentIndicesKHR_params
{
VkCommandBuffer commandBuffer;
const VkRenderingInputAttachmentIndexInfoKHR *pLocationInfo;
};
struct vkCmdSetRepresentativeFragmentTestEnableNV_params
{
VkCommandBuffer commandBuffer;
......@@ -3570,7 +3636,17 @@ struct vkGetCalibratedTimestampsEXT_params
{
VkDevice device;
uint32_t timestampCount;
const VkCalibratedTimestampInfoEXT *pTimestampInfos;
const VkCalibratedTimestampInfoKHR *pTimestampInfos;
uint64_t *pTimestamps;
uint64_t *pMaxDeviation;
VkResult result;
};
struct vkGetCalibratedTimestampsKHR_params
{
VkDevice device;
uint32_t timestampCount;
const VkCalibratedTimestampInfoKHR *pTimestampInfos;
uint64_t *pTimestamps;
uint64_t *pMaxDeviation;
VkResult result;
......@@ -3974,7 +4050,15 @@ struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params
{
VkPhysicalDevice physicalDevice;
uint32_t *pTimeDomainCount;
VkTimeDomainEXT *pTimeDomains;
VkTimeDomainKHR *pTimeDomains;
VkResult result;
};
struct vkGetPhysicalDeviceCalibrateableTimeDomainsKHR_params
{
VkPhysicalDevice physicalDevice;
uint32_t *pTimeDomainCount;
VkTimeDomainKHR *pTimeDomains;
VkResult result;
};
......
dlls/winevulkan/make_vulkan
View file @ ea890c47
......@@ -64,7 +64,7 @@ from enum import Enum
LOGGER = logging.Logger("vulkan")
LOGGER.addHandler(logging.StreamHandler())
VK_XML_VERSION = "1.3.272"
VK_XML_VERSION = "1.3.277"
WINE_VK_VERSION = (1, 3)
# Filenames to create.
......@@ -102,6 +102,7 @@ UNSUPPORTED_EXTENSIONS = [
"VK_KHR_external_semaphore_win32",
# Relates to external_semaphore and needs type conversions in bitflags.
"VK_KHR_shared_presentable_image", # Needs WSI work.
"VK_KHR_video_encode_queue",
"VK_KHR_video_queue", # TODO Video extensions use separate headers + xml
"VK_KHR_win32_keyed_mutex",
"VK_NV_external_memory_rdma", # Needs shared resources work.
......@@ -244,11 +245,13 @@ MANUAL_UNIX_THUNKS = {
"vkFreeCommandBuffers",
"vkFreeMemory",
"vkGetCalibratedTimestampsEXT",
"vkGetCalibratedTimestampsKHR",
"vkGetDeviceProcAddr",
"vkGetDeviceQueue",
"vkGetDeviceQueue2",
"vkGetInstanceProcAddr",
"vkGetPhysicalDeviceCalibrateableTimeDomainsEXT",
"vkGetPhysicalDeviceCalibrateableTimeDomainsKHR",
"vkGetPhysicalDeviceExternalBufferProperties",
"vkGetPhysicalDeviceExternalBufferPropertiesKHR",
"vkGetPhysicalDeviceExternalFenceProperties",
......
dlls/winevulkan/vulkan.c
View file @ ea890c47
......@@ -1443,6 +1443,18 @@ VkResult wine_vkGetCalibratedTimestampsEXT(VkDevice handle, uint32_t timestamp_c
device->funcs.p_vkGetCalibratedTimestampsEXT);
}
VkResult wine_vkGetCalibratedTimestampsKHR(VkDevice handle, uint32_t timestamp_count,
const VkCalibratedTimestampInfoKHR *timestamp_infos,
uint64_t *timestamps, uint64_t *max_deviation)
{
struct wine_device *device = wine_device_from_handle(handle);
TRACE("%p, %u, %p, %p, %p\n", device, timestamp_count, timestamp_infos, timestamps, max_deviation);
return wine_vk_get_timestamps(device, timestamp_count, timestamp_infos, timestamps, max_deviation,
device->funcs.p_vkGetCalibratedTimestampsKHR);
}
VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice handle,
uint32_t *time_domain_count,
VkTimeDomainEXT *time_domains)
......@@ -1455,6 +1467,20 @@ VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice ha
phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT);
}
VkResult wine_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(VkPhysicalDevice handle,
uint32_t *time_domain_count,
VkTimeDomainKHR *time_domains)
{
struct wine_phys_dev *phys_dev = wine_phys_dev_from_handle(handle);
TRACE("%p, %p, %p\n", phys_dev, time_domain_count, time_domains);
return wine_vk_get_time_domains(phys_dev, time_domain_count, time_domains,
phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR);
}
void wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev,
const VkPhysicalDeviceExternalSemaphoreInfo *info,
VkExternalSemaphoreProperties *properties)
......
dlls/winevulkan/vulkan_thunks.c
View file @ ea890c47
This source diff could not be displayed because it is too large. You can view the blob instead.
dlls/winevulkan/winevulkan.json
View file @ ea890c47
......@@ -2,6 +2,6 @@
"file_format_version": "1.0.0",
"ICD": {
"library_path": ".\\winevulkan.dll",
"api_version": "1.3.272"
"api_version": "1.3.277"
}
}
dlls/winevulkan/winevulkan.spec
View file @ ea890c47
......@@ -3,7 +3,7 @@
# This file is generated from Vulkan vk.xml file covered
# by the following copyright and permission notice:
#
# Copyright 2015-2023 The Khronos Group Inc.
# Copyright 2015-2024 The Khronos Group Inc.
#
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
......
include/wine/vulkan_driver.h
View file @ ea890c47
......@@ -3,7 +3,7 @@
* This file is generated from Vulkan vk.xml file covered
* by the following copyright and permission notice:
*
* Copyright 2015-2023 The Khronos Group Inc.
* Copyright 2015-2024 The Khronos Group Inc.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
......
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