Skip to content

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

winevulkan: Update to VK spec version 1.3.258.

This does not enable VK_NV_device_generated_commands_compute because the extension will likely see an API breaking naming fix.
parent 61ad9174
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 2 deletions
dlls/winevulkan/loader_thunks.c
View file @ eb5be00e
......@@ -2490,6 +2490,28 @@ VkResult WINAPI vkCopyAccelerationStructureToMemoryKHR(VkDevice device, VkDeferr
return params.result;
}
VkResult WINAPI vkCopyImageToImageEXT(VkDevice device, const VkCopyImageToImageInfoEXT *pCopyImageToImageInfo)
{
struct vkCopyImageToImageEXT_params params;
NTSTATUS status;
params.device = device;
params.pCopyImageToImageInfo = pCopyImageToImageInfo;
status = UNIX_CALL(vkCopyImageToImageEXT, &params);
assert(!status && "vkCopyImageToImageEXT");
return params.result;
}
VkResult WINAPI vkCopyImageToMemoryEXT(VkDevice device, const VkCopyImageToMemoryInfoEXT *pCopyImageToMemoryInfo)
{
struct vkCopyImageToMemoryEXT_params params;
NTSTATUS status;
params.device = device;
params.pCopyImageToMemoryInfo = pCopyImageToMemoryInfo;
status = UNIX_CALL(vkCopyImageToMemoryEXT, &params);
assert(!status && "vkCopyImageToMemoryEXT");
return params.result;
}
VkResult WINAPI vkCopyMemoryToAccelerationStructureKHR(VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo)
{
struct vkCopyMemoryToAccelerationStructureKHR_params params;
......@@ -2502,6 +2524,17 @@ VkResult WINAPI vkCopyMemoryToAccelerationStructureKHR(VkDevice device, VkDeferr
return params.result;
}
VkResult WINAPI vkCopyMemoryToImageEXT(VkDevice device, const VkCopyMemoryToImageInfoEXT *pCopyMemoryToImageInfo)
{
struct vkCopyMemoryToImageEXT_params params;
NTSTATUS status;
params.device = device;
params.pCopyMemoryToImageInfo = pCopyMemoryToImageInfo;
status = UNIX_CALL(vkCopyMemoryToImageEXT, &params);
assert(!status && "vkCopyMemoryToImageEXT");
return params.result;
}
VkResult WINAPI vkCopyMemoryToMicromapEXT(VkDevice device, VkDeferredOperationKHR deferredOperation, const VkCopyMemoryToMicromapInfoEXT *pInfo)
{
struct vkCopyMemoryToMicromapEXT_params params;
......@@ -4419,6 +4452,18 @@ VkResult WINAPI vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice
return params.result;
}
VkResult WINAPI vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(VkPhysicalDevice physicalDevice, uint32_t *pPropertyCount, VkCooperativeMatrixPropertiesKHR *pProperties)
{
struct vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR_params params;
NTSTATUS status;
params.physicalDevice = physicalDevice;
params.pPropertyCount = pPropertyCount;
params.pProperties = pProperties;
status = UNIX_CALL(vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR, &params);
assert(!status && "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR");
return params.result;
}
VkResult WINAPI vkGetPhysicalDeviceCooperativeMatrixPropertiesNV(VkPhysicalDevice physicalDevice, uint32_t *pPropertyCount, VkCooperativeMatrixPropertiesNV *pProperties)
{
struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params params;
......@@ -5626,6 +5671,18 @@ void WINAPI vkSubmitDebugUtilsMessageEXT(VkInstance instance, VkDebugUtilsMessag
assert(!status && "vkSubmitDebugUtilsMessageEXT");
}
VkResult WINAPI vkTransitionImageLayoutEXT(VkDevice device, uint32_t transitionCount, const VkHostImageLayoutTransitionInfoEXT *pTransitions)
{
struct vkTransitionImageLayoutEXT_params params;
NTSTATUS status;
params.device = device;
params.transitionCount = transitionCount;
params.pTransitions = pTransitions;
status = UNIX_CALL(vkTransitionImageLayoutEXT, &params);
assert(!status && "vkTransitionImageLayoutEXT");
return params.result;
}
void WINAPI vkTrimCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags)
{
struct vkTrimCommandPool_params params;
......@@ -6049,7 +6106,10 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkCompileDeferredNV", vkCompileDeferredNV},
{"vkCopyAccelerationStructureKHR", vkCopyAccelerationStructureKHR},
{"vkCopyAccelerationStructureToMemoryKHR", vkCopyAccelerationStructureToMemoryKHR},
{"vkCopyImageToImageEXT", vkCopyImageToImageEXT},
{"vkCopyImageToMemoryEXT", vkCopyImageToMemoryEXT},
{"vkCopyMemoryToAccelerationStructureKHR", vkCopyMemoryToAccelerationStructureKHR},
{"vkCopyMemoryToImageEXT", vkCopyMemoryToImageEXT},
{"vkCopyMemoryToMicromapEXT", vkCopyMemoryToMicromapEXT},
{"vkCopyMicromapEXT", vkCopyMicromapEXT},
{"vkCopyMicromapToMemoryEXT", vkCopyMicromapToMemoryEXT},
......@@ -6261,6 +6321,7 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkSetPrivateDataEXT", vkSetPrivateDataEXT},
{"vkSignalSemaphore", vkSignalSemaphore},
{"vkSignalSemaphoreKHR", vkSignalSemaphoreKHR},
{"vkTransitionImageLayoutEXT", vkTransitionImageLayoutEXT},
{"vkTrimCommandPool", vkTrimCommandPool},
{"vkTrimCommandPoolKHR", vkTrimCommandPoolKHR},
{"vkUninitializePerformanceApiINTEL", vkUninitializePerformanceApiINTEL},
......@@ -6284,6 +6345,7 @@ static const struct vulkan_func vk_phys_dev_dispatch_table[] =
{"vkEnumerateDeviceLayerProperties", vkEnumerateDeviceLayerProperties},
{"vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR", vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR},
{"vkGetPhysicalDeviceCalibrateableTimeDomainsEXT", vkGetPhysicalDeviceCalibrateableTimeDomainsEXT},
{"vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR", vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR},
{"vkGetPhysicalDeviceCooperativeMatrixPropertiesNV", vkGetPhysicalDeviceCooperativeMatrixPropertiesNV},
{"vkGetPhysicalDeviceExternalBufferProperties", vkGetPhysicalDeviceExternalBufferProperties},
{"vkGetPhysicalDeviceExternalBufferPropertiesKHR", vkGetPhysicalDeviceExternalBufferPropertiesKHR},
......
dlls/winevulkan/loader_thunks.h
View file @ eb5be00e
......@@ -270,7 +270,10 @@ enum unix_call
unix_vkCompileDeferredNV,
unix_vkCopyAccelerationStructureKHR,
unix_vkCopyAccelerationStructureToMemoryKHR,
unix_vkCopyImageToImageEXT,
unix_vkCopyImageToMemoryEXT,
unix_vkCopyMemoryToAccelerationStructureKHR,
unix_vkCopyMemoryToImageEXT,
unix_vkCopyMemoryToMicromapEXT,
unix_vkCopyMicromapEXT,
unix_vkCopyMicromapToMemoryEXT,
......@@ -441,6 +444,7 @@ enum unix_call
unix_vkGetMicromapBuildSizesEXT,
unix_vkGetPerformanceParameterINTEL,
unix_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT,
unix_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR,
unix_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV,
unix_vkGetPhysicalDeviceExternalBufferProperties,
unix_vkGetPhysicalDeviceExternalBufferPropertiesKHR,
......@@ -544,6 +548,7 @@ enum unix_call
unix_vkSignalSemaphore,
unix_vkSignalSemaphoreKHR,
unix_vkSubmitDebugUtilsMessageEXT,
unix_vkTransitionImageLayoutEXT,
unix_vkTrimCommandPool,
unix_vkTrimCommandPoolKHR,
unix_vkUninitializePerformanceApiINTEL,
......@@ -2496,6 +2501,20 @@ struct vkCopyAccelerationStructureToMemoryKHR_params
VkResult result;
};
struct vkCopyImageToImageEXT_params
{
VkDevice device;
const VkCopyImageToImageInfoEXT *pCopyImageToImageInfo;
VkResult result;
};
struct vkCopyImageToMemoryEXT_params
{
VkDevice device;
const VkCopyImageToMemoryInfoEXT *pCopyImageToMemoryInfo;
VkResult result;
};
struct vkCopyMemoryToAccelerationStructureKHR_params
{
VkDevice device;
......@@ -2504,6 +2523,13 @@ struct vkCopyMemoryToAccelerationStructureKHR_params
VkResult result;
};
struct vkCopyMemoryToImageEXT_params
{
VkDevice device;
const VkCopyMemoryToImageInfoEXT *pCopyMemoryToImageInfo;
VkResult result;
};
struct vkCopyMemoryToMicromapEXT_params
{
VkDevice device;
......@@ -3849,6 +3875,14 @@ struct vkGetPhysicalDeviceCalibrateableTimeDomainsEXT_params
VkResult result;
};
struct vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR_params
{
VkPhysicalDevice physicalDevice;
uint32_t *pPropertyCount;
VkCooperativeMatrixPropertiesKHR *pProperties;
VkResult result;
};
struct vkGetPhysicalDeviceCooperativeMatrixPropertiesNV_params
{
VkPhysicalDevice physicalDevice;
......@@ -4664,6 +4698,14 @@ struct vkSubmitDebugUtilsMessageEXT_params
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData;
};
struct vkTransitionImageLayoutEXT_params
{
VkDevice device;
uint32_t transitionCount;
const VkHostImageLayoutTransitionInfoEXT *pTransitions;
VkResult result;
};
struct vkTrimCommandPool_params
{
VkDevice device;
......
dlls/winevulkan/make_vulkan
View file @ eb5be00e
......@@ -65,7 +65,7 @@ from enum import Enum
LOGGER = logging.Logger("vulkan")
LOGGER.addHandler(logging.StreamHandler())
VK_XML_VERSION = "1.3.254"
VK_XML_VERSION = "1.3.258"
WINE_VK_VERSION = (1, 3)
# Filenames to create.
......@@ -123,6 +123,9 @@ UNSUPPORTED_EXTENSIONS = [
# Deprecated extensions
"VK_NV_external_memory_capabilities",
"VK_NV_external_memory_win32",
# Likely broken: https://github.com/KhronosGroup/Vulkan-Docs/issues/2171
"VK_NV_device_generated_commands_compute",
]
# Either internal extensions which aren't present on the win32 platform which
......
dlls/winevulkan/vulkan_thunks.h
View file @ eb5be00e
......@@ -317,7 +317,10 @@ struct vulkan_device_funcs
VkResult (*p_vkCompileDeferredNV)(VkDevice, VkPipeline, uint32_t);
VkResult (*p_vkCopyAccelerationStructureKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyAccelerationStructureInfoKHR *);
VkResult (*p_vkCopyAccelerationStructureToMemoryKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyAccelerationStructureToMemoryInfoKHR *);
VkResult (*p_vkCopyImageToImageEXT)(VkDevice, const VkCopyImageToImageInfoEXT *);
VkResult (*p_vkCopyImageToMemoryEXT)(VkDevice, const VkCopyImageToMemoryInfoEXT *);
VkResult (*p_vkCopyMemoryToAccelerationStructureKHR)(VkDevice, VkDeferredOperationKHR, const VkCopyMemoryToAccelerationStructureInfoKHR *);
VkResult (*p_vkCopyMemoryToImageEXT)(VkDevice, const VkCopyMemoryToImageInfoEXT *);
VkResult (*p_vkCopyMemoryToMicromapEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMemoryToMicromapInfoEXT *);
VkResult (*p_vkCopyMicromapEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMicromapInfoEXT *);
VkResult (*p_vkCopyMicromapToMemoryEXT)(VkDevice, VkDeferredOperationKHR, const VkCopyMicromapToMemoryInfoEXT *);
......@@ -528,6 +531,7 @@ struct vulkan_device_funcs
VkResult (*p_vkSetPrivateDataEXT)(VkDevice, VkObjectType, uint64_t, VkPrivateDataSlot, uint64_t);
VkResult (*p_vkSignalSemaphore)(VkDevice, const VkSemaphoreSignalInfo *);
VkResult (*p_vkSignalSemaphoreKHR)(VkDevice, const VkSemaphoreSignalInfo *);
VkResult (*p_vkTransitionImageLayoutEXT)(VkDevice, uint32_t, const VkHostImageLayoutTransitionInfoEXT *);
void (*p_vkTrimCommandPool)(VkDevice, VkCommandPool, VkCommandPoolTrimFlags);
void (*p_vkTrimCommandPoolKHR)(VkDevice, VkCommandPool, VkCommandPoolTrimFlags);
void (*p_vkUninitializePerformanceApiINTEL)(VkDevice);
......@@ -563,6 +567,7 @@ struct vulkan_instance_funcs
VkResult (*p_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice, uint32_t *, VkLayerProperties *);
VkResult (*p_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR)(VkPhysicalDevice, uint32_t, uint32_t *, VkPerformanceCounterKHR *, VkPerformanceCounterDescriptionKHR *);
VkResult (*p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT)(VkPhysicalDevice, uint32_t *, VkTimeDomainEXT *);
VkResult (*p_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR)(VkPhysicalDevice, uint32_t *, VkCooperativeMatrixPropertiesKHR *);
VkResult (*p_vkGetPhysicalDeviceCooperativeMatrixPropertiesNV)(VkPhysicalDevice, uint32_t *, VkCooperativeMatrixPropertiesNV *);
void (*p_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice, VkPhysicalDeviceFeatures *);
void (*p_vkGetPhysicalDeviceFeatures2)(VkPhysicalDevice, VkPhysicalDeviceFeatures2 *);
......@@ -856,7 +861,10 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkCompileDeferredNV) \
USE_VK_FUNC(vkCopyAccelerationStructureKHR) \
USE_VK_FUNC(vkCopyAccelerationStructureToMemoryKHR) \
USE_VK_FUNC(vkCopyImageToImageEXT) \
USE_VK_FUNC(vkCopyImageToMemoryEXT) \
USE_VK_FUNC(vkCopyMemoryToAccelerationStructureKHR) \
USE_VK_FUNC(vkCopyMemoryToImageEXT) \
USE_VK_FUNC(vkCopyMemoryToMicromapEXT) \
USE_VK_FUNC(vkCopyMicromapEXT) \
USE_VK_FUNC(vkCopyMicromapToMemoryEXT) \
......@@ -1067,6 +1075,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkSetPrivateDataEXT) \
USE_VK_FUNC(vkSignalSemaphore) \
USE_VK_FUNC(vkSignalSemaphoreKHR) \
USE_VK_FUNC(vkTransitionImageLayoutEXT) \
USE_VK_FUNC(vkTrimCommandPool) \
USE_VK_FUNC(vkTrimCommandPoolKHR) \
USE_VK_FUNC(vkUninitializePerformanceApiINTEL) \
......@@ -1099,6 +1108,7 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkEnumerateDeviceLayerProperties) \
USE_VK_FUNC(vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR) \
USE_VK_FUNC(vkGetPhysicalDeviceCalibrateableTimeDomainsEXT) \
USE_VK_FUNC(vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR) \
USE_VK_FUNC(vkGetPhysicalDeviceCooperativeMatrixPropertiesNV) \
USE_VK_FUNC(vkGetPhysicalDeviceFeatures) \
USE_VK_FUNC(vkGetPhysicalDeviceFeatures2) \
......
dlls/winevulkan/winevulkan.json
View file @ eb5be00e
......@@ -2,6 +2,6 @@
"file_format_version": "1.0.0",
"ICD": {
"library_path": ".\\winevulkan.dll",
"api_version": "1.3.254"
"api_version": "1.3.258"
}
}
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