Commit d493fab3 authored by Georg Lehmann's avatar Georg Lehmann Committed by Alexandre Julliard

winevulkan: Update to VK spec version 1.3.224.

parent d3638d42
...@@ -3154,6 +3154,15 @@ VkResult WINAPI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(VkDevice device, ...@@ -3154,6 +3154,15 @@ VkResult WINAPI vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(VkDevice device,
return vk_unix_call(unix_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, &params); return vk_unix_call(unix_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, &params);
} }
VkResult WINAPI vkGetDynamicRenderingTilePropertiesQCOM(VkDevice device, const VkRenderingInfo *pRenderingInfo, VkTilePropertiesQCOM *pProperties)
{
struct vkGetDynamicRenderingTilePropertiesQCOM_params params;
params.device = device;
params.pRenderingInfo = pRenderingInfo;
params.pProperties = pProperties;
return vk_unix_call(unix_vkGetDynamicRenderingTilePropertiesQCOM, &params);
}
VkResult WINAPI vkGetEventStatus(VkDevice device, VkEvent event) VkResult WINAPI vkGetEventStatus(VkDevice device, VkEvent event)
{ {
struct vkGetEventStatus_params params; struct vkGetEventStatus_params params;
...@@ -3170,6 +3179,16 @@ VkResult WINAPI vkGetFenceStatus(VkDevice device, VkFence fence) ...@@ -3170,6 +3179,16 @@ VkResult WINAPI vkGetFenceStatus(VkDevice device, VkFence fence)
return vk_unix_call(unix_vkGetFenceStatus, &params); return vk_unix_call(unix_vkGetFenceStatus, &params);
} }
VkResult WINAPI vkGetFramebufferTilePropertiesQCOM(VkDevice device, VkFramebuffer framebuffer, uint32_t *pPropertiesCount, VkTilePropertiesQCOM *pProperties)
{
struct vkGetFramebufferTilePropertiesQCOM_params params;
params.device = device;
params.framebuffer = framebuffer;
params.pPropertiesCount = pPropertiesCount;
params.pProperties = pProperties;
return vk_unix_call(unix_vkGetFramebufferTilePropertiesQCOM, &params);
}
void WINAPI vkGetGeneratedCommandsMemoryRequirementsNV(VkDevice device, const VkGeneratedCommandsMemoryRequirementsInfoNV *pInfo, VkMemoryRequirements2 *pMemoryRequirements) void WINAPI vkGetGeneratedCommandsMemoryRequirementsNV(VkDevice device, const VkGeneratedCommandsMemoryRequirementsInfoNV *pInfo, VkMemoryRequirements2 *pMemoryRequirements)
{ {
struct vkGetGeneratedCommandsMemoryRequirementsNV_params params; struct vkGetGeneratedCommandsMemoryRequirementsNV_params params;
...@@ -4620,8 +4639,10 @@ static const struct vulkan_func vk_device_dispatch_table[] = ...@@ -4620,8 +4639,10 @@ static const struct vulkan_func vk_device_dispatch_table[] =
{"vkGetDeviceQueue", vkGetDeviceQueue}, {"vkGetDeviceQueue", vkGetDeviceQueue},
{"vkGetDeviceQueue2", vkGetDeviceQueue2}, {"vkGetDeviceQueue2", vkGetDeviceQueue2},
{"vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI", vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI}, {"vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI", vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI},
{"vkGetDynamicRenderingTilePropertiesQCOM", vkGetDynamicRenderingTilePropertiesQCOM},
{"vkGetEventStatus", vkGetEventStatus}, {"vkGetEventStatus", vkGetEventStatus},
{"vkGetFenceStatus", vkGetFenceStatus}, {"vkGetFenceStatus", vkGetFenceStatus},
{"vkGetFramebufferTilePropertiesQCOM", vkGetFramebufferTilePropertiesQCOM},
{"vkGetGeneratedCommandsMemoryRequirementsNV", vkGetGeneratedCommandsMemoryRequirementsNV}, {"vkGetGeneratedCommandsMemoryRequirementsNV", vkGetGeneratedCommandsMemoryRequirementsNV},
{"vkGetImageMemoryRequirements", vkGetImageMemoryRequirements}, {"vkGetImageMemoryRequirements", vkGetImageMemoryRequirements},
{"vkGetImageMemoryRequirements2", vkGetImageMemoryRequirements2}, {"vkGetImageMemoryRequirements2", vkGetImageMemoryRequirements2},
......
...@@ -345,8 +345,10 @@ enum unix_call ...@@ -345,8 +345,10 @@ enum unix_call
unix_vkGetDeviceQueue, unix_vkGetDeviceQueue,
unix_vkGetDeviceQueue2, unix_vkGetDeviceQueue2,
unix_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, unix_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI,
unix_vkGetDynamicRenderingTilePropertiesQCOM,
unix_vkGetEventStatus, unix_vkGetEventStatus,
unix_vkGetFenceStatus, unix_vkGetFenceStatus,
unix_vkGetFramebufferTilePropertiesQCOM,
unix_vkGetGeneratedCommandsMemoryRequirementsNV, unix_vkGetGeneratedCommandsMemoryRequirementsNV,
unix_vkGetImageMemoryRequirements, unix_vkGetImageMemoryRequirements,
unix_vkGetImageMemoryRequirements2, unix_vkGetImageMemoryRequirements2,
...@@ -2981,6 +2983,13 @@ struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params ...@@ -2981,6 +2983,13 @@ struct vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI_params
VkExtent2D *pMaxWorkgroupSize; VkExtent2D *pMaxWorkgroupSize;
}; };
struct vkGetDynamicRenderingTilePropertiesQCOM_params
{
VkDevice device;
const VkRenderingInfo *pRenderingInfo;
VkTilePropertiesQCOM *pProperties;
};
struct vkGetEventStatus_params struct vkGetEventStatus_params
{ {
VkDevice device; VkDevice device;
...@@ -2993,6 +3002,14 @@ struct vkGetFenceStatus_params ...@@ -2993,6 +3002,14 @@ struct vkGetFenceStatus_params
VkFence fence; VkFence fence;
}; };
struct vkGetFramebufferTilePropertiesQCOM_params
{
VkDevice device;
VkFramebuffer framebuffer;
uint32_t *pPropertiesCount;
VkTilePropertiesQCOM *pProperties;
};
struct vkGetGeneratedCommandsMemoryRequirementsNV_params struct vkGetGeneratedCommandsMemoryRequirementsNV_params
{ {
VkDevice device; VkDevice device;
......
...@@ -64,7 +64,7 @@ from enum import Enum ...@@ -64,7 +64,7 @@ from enum import Enum
LOGGER = logging.Logger("vulkan") LOGGER = logging.Logger("vulkan")
LOGGER.addHandler(logging.StreamHandler()) LOGGER.addHandler(logging.StreamHandler())
VK_XML_VERSION = "1.3.221" VK_XML_VERSION = "1.3.224"
WINE_VK_VERSION = (1, 3) WINE_VK_VERSION = (1, 3)
# Filenames to create. # Filenames to create.
...@@ -113,6 +113,7 @@ UNSUPPORTED_EXTENSIONS = [ ...@@ -113,6 +113,7 @@ UNSUPPORTED_EXTENSIONS = [
"VK_KHR_external_fence_fd", "VK_KHR_external_fence_fd",
"VK_KHR_external_memory_fd", "VK_KHR_external_memory_fd",
"VK_KHR_external_semaphore_fd", "VK_KHR_external_semaphore_fd",
"VK_SEC_amigo_profiling", # Angle specific.
# Extensions which require callback handling # Extensions which require callback handling
"VK_EXT_device_memory_report", "VK_EXT_device_memory_report",
......
...@@ -5018,6 +5018,56 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea ...@@ -5018,6 +5018,56 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea
break; break;
} }
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_PROCESSING_FEATURES_QCOM:
{
const VkPhysicalDeviceImageProcessingFeaturesQCOM *in = (const VkPhysicalDeviceImageProcessingFeaturesQCOM *)in_header;
VkPhysicalDeviceImageProcessingFeaturesQCOM *out;
if (!(out = malloc(sizeof(*out)))) goto out_of_memory;
out->sType = in->sType;
out->pNext = NULL;
out->textureSampleWeighted = in->textureSampleWeighted;
out->textureBoxFilter = in->textureBoxFilter;
out->textureBlockMatch = in->textureBlockMatch;
out_header->pNext = (VkBaseOutStructure *)out;
out_header = out_header->pNext;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM:
{
const VkPhysicalDeviceTilePropertiesFeaturesQCOM *in = (const VkPhysicalDeviceTilePropertiesFeaturesQCOM *)in_header;
VkPhysicalDeviceTilePropertiesFeaturesQCOM *out;
if (!(out = malloc(sizeof(*out)))) goto out_of_memory;
out->sType = in->sType;
out->pNext = NULL;
out->tileProperties = in->tileProperties;
out_header->pNext = (VkBaseOutStructure *)out;
out_header = out_header->pNext;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ATTACHMENT_FEEDBACK_LOOP_LAYOUT_FEATURES_EXT:
{
const VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT *in = (const VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT *)in_header;
VkPhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT *out;
if (!(out = malloc(sizeof(*out)))) goto out_of_memory;
out->sType = in->sType;
out->pNext = NULL;
out->attachmentFeedbackLoopLayout = in->attachmentFeedbackLoopLayout;
out_header->pNext = (VkBaseOutStructure *)out;
out_header = out_header->pNext;
break;
}
default: default:
FIXME("Application requested a linked structure of type %u.\n", in_header->sType); FIXME("Application requested a linked structure of type %u.\n", in_header->sType);
} }
...@@ -8600,6 +8650,25 @@ static NTSTATUS wine_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args) ...@@ -8600,6 +8650,25 @@ static NTSTATUS wine_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(void *args)
return params->device->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(params->device->device, params->renderpass, params->pMaxWorkgroupSize); return params->device->funcs.p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI(params->device->device, params->renderpass, params->pMaxWorkgroupSize);
} }
static NTSTATUS wine_vkGetDynamicRenderingTilePropertiesQCOM(void *args)
{
struct vkGetDynamicRenderingTilePropertiesQCOM_params *params = args;
#if defined(USE_STRUCT_CONVERSION)
VkResult result;
VkRenderingInfo_host pRenderingInfo_host;
TRACE("%p, %p, %p\n", params->device, params->pRenderingInfo, params->pProperties);
convert_VkRenderingInfo_win_to_host(params->pRenderingInfo, &pRenderingInfo_host);
result = params->device->funcs.p_vkGetDynamicRenderingTilePropertiesQCOM(params->device->device, &pRenderingInfo_host, params->pProperties);
free_VkRenderingInfo(&pRenderingInfo_host);
return result;
#else
TRACE("%p, %p, %p\n", params->device, params->pRenderingInfo, params->pProperties);
return params->device->funcs.p_vkGetDynamicRenderingTilePropertiesQCOM(params->device->device, params->pRenderingInfo, params->pProperties);
#endif
}
static NTSTATUS wine_vkGetEventStatus(void *args) static NTSTATUS wine_vkGetEventStatus(void *args)
{ {
struct vkGetEventStatus_params *params = args; struct vkGetEventStatus_params *params = args;
...@@ -8614,6 +8683,13 @@ static NTSTATUS wine_vkGetFenceStatus(void *args) ...@@ -8614,6 +8683,13 @@ static NTSTATUS wine_vkGetFenceStatus(void *args)
return params->device->funcs.p_vkGetFenceStatus(params->device->device, params->fence); return params->device->funcs.p_vkGetFenceStatus(params->device->device, params->fence);
} }
static NTSTATUS wine_vkGetFramebufferTilePropertiesQCOM(void *args)
{
struct vkGetFramebufferTilePropertiesQCOM_params *params = args;
TRACE("%p, 0x%s, %p, %p\n", params->device, wine_dbgstr_longlong(params->framebuffer), params->pPropertiesCount, params->pProperties);
return params->device->funcs.p_vkGetFramebufferTilePropertiesQCOM(params->device->device, params->framebuffer, params->pPropertiesCount, params->pProperties);
}
static NTSTATUS wine_vkGetGeneratedCommandsMemoryRequirementsNV(void *args) static NTSTATUS wine_vkGetGeneratedCommandsMemoryRequirementsNV(void *args)
{ {
struct vkGetGeneratedCommandsMemoryRequirementsNV_params *params = args; struct vkGetGeneratedCommandsMemoryRequirementsNV_params *params = args;
...@@ -9933,6 +10009,7 @@ static const char * const vk_device_extensions[] = ...@@ -9933,6 +10009,7 @@ static const char * const vk_device_extensions[] =
"VK_ARM_rasterization_order_attachment_access", "VK_ARM_rasterization_order_attachment_access",
"VK_EXT_4444_formats", "VK_EXT_4444_formats",
"VK_EXT_astc_decode_mode", "VK_EXT_astc_decode_mode",
"VK_EXT_attachment_feedback_loop_layout",
"VK_EXT_blend_operation_advanced", "VK_EXT_blend_operation_advanced",
"VK_EXT_border_color_swizzle", "VK_EXT_border_color_swizzle",
"VK_EXT_buffer_device_address", "VK_EXT_buffer_device_address",
...@@ -10118,10 +10195,12 @@ static const char * const vk_device_extensions[] = ...@@ -10118,10 +10195,12 @@ static const char * const vk_device_extensions[] =
"VK_NV_viewport_array2", "VK_NV_viewport_array2",
"VK_NV_viewport_swizzle", "VK_NV_viewport_swizzle",
"VK_QCOM_fragment_density_map_offset", "VK_QCOM_fragment_density_map_offset",
"VK_QCOM_image_processing",
"VK_QCOM_render_pass_shader_resolve", "VK_QCOM_render_pass_shader_resolve",
"VK_QCOM_render_pass_store_ops", "VK_QCOM_render_pass_store_ops",
"VK_QCOM_render_pass_transform", "VK_QCOM_render_pass_transform",
"VK_QCOM_rotated_copy_commands", "VK_QCOM_rotated_copy_commands",
"VK_QCOM_tile_properties",
"VK_VALVE_descriptor_set_host_mapping", "VK_VALVE_descriptor_set_host_mapping",
"VK_VALVE_mutable_descriptor_type", "VK_VALVE_mutable_descriptor_type",
}; };
...@@ -10540,8 +10619,10 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ...@@ -10540,8 +10619,10 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
wine_vkGetDeviceQueue, wine_vkGetDeviceQueue,
wine_vkGetDeviceQueue2, wine_vkGetDeviceQueue2,
wine_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI, wine_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI,
wine_vkGetDynamicRenderingTilePropertiesQCOM,
wine_vkGetEventStatus, wine_vkGetEventStatus,
wine_vkGetFenceStatus, wine_vkGetFenceStatus,
wine_vkGetFramebufferTilePropertiesQCOM,
wine_vkGetGeneratedCommandsMemoryRequirementsNV, wine_vkGetGeneratedCommandsMemoryRequirementsNV,
wine_vkGetImageMemoryRequirements, wine_vkGetImageMemoryRequirements,
wine_vkGetImageMemoryRequirements2, wine_vkGetImageMemoryRequirements2,
......
...@@ -2141,8 +2141,10 @@ struct vulkan_device_funcs ...@@ -2141,8 +2141,10 @@ struct vulkan_device_funcs
void (*p_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *); void (*p_vkGetDeviceQueue)(VkDevice, uint32_t, uint32_t, VkQueue *);
void (*p_vkGetDeviceQueue2)(VkDevice, const VkDeviceQueueInfo2 *, VkQueue *); void (*p_vkGetDeviceQueue2)(VkDevice, const VkDeviceQueueInfo2 *, VkQueue *);
VkResult (*p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI)(VkDevice, VkRenderPass, VkExtent2D *); VkResult (*p_vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI)(VkDevice, VkRenderPass, VkExtent2D *);
VkResult (*p_vkGetDynamicRenderingTilePropertiesQCOM)(VkDevice, const VkRenderingInfo_host *, VkTilePropertiesQCOM *);
VkResult (*p_vkGetEventStatus)(VkDevice, VkEvent); VkResult (*p_vkGetEventStatus)(VkDevice, VkEvent);
VkResult (*p_vkGetFenceStatus)(VkDevice, VkFence); VkResult (*p_vkGetFenceStatus)(VkDevice, VkFence);
VkResult (*p_vkGetFramebufferTilePropertiesQCOM)(VkDevice, VkFramebuffer, uint32_t *, VkTilePropertiesQCOM *);
void (*p_vkGetGeneratedCommandsMemoryRequirementsNV)(VkDevice, const VkGeneratedCommandsMemoryRequirementsInfoNV_host *, VkMemoryRequirements2_host *); void (*p_vkGetGeneratedCommandsMemoryRequirementsNV)(VkDevice, const VkGeneratedCommandsMemoryRequirementsInfoNV_host *, VkMemoryRequirements2_host *);
void (*p_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements_host *); void (*p_vkGetImageMemoryRequirements)(VkDevice, VkImage, VkMemoryRequirements_host *);
void (*p_vkGetImageMemoryRequirements2)(VkDevice, const VkImageMemoryRequirementsInfo2_host *, VkMemoryRequirements2_host *); void (*p_vkGetImageMemoryRequirements2)(VkDevice, const VkImageMemoryRequirementsInfo2_host *, VkMemoryRequirements2_host *);
...@@ -2596,8 +2598,10 @@ struct vulkan_instance_funcs ...@@ -2596,8 +2598,10 @@ struct vulkan_instance_funcs
USE_VK_FUNC(vkGetDeviceQueue) \ USE_VK_FUNC(vkGetDeviceQueue) \
USE_VK_FUNC(vkGetDeviceQueue2) \ USE_VK_FUNC(vkGetDeviceQueue2) \
USE_VK_FUNC(vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI) \ USE_VK_FUNC(vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI) \
USE_VK_FUNC(vkGetDynamicRenderingTilePropertiesQCOM) \
USE_VK_FUNC(vkGetEventStatus) \ USE_VK_FUNC(vkGetEventStatus) \
USE_VK_FUNC(vkGetFenceStatus) \ USE_VK_FUNC(vkGetFenceStatus) \
USE_VK_FUNC(vkGetFramebufferTilePropertiesQCOM) \
USE_VK_FUNC(vkGetGeneratedCommandsMemoryRequirementsNV) \ USE_VK_FUNC(vkGetGeneratedCommandsMemoryRequirementsNV) \
USE_VK_FUNC(vkGetImageMemoryRequirements) \ USE_VK_FUNC(vkGetImageMemoryRequirements) \
USE_VK_FUNC(vkGetImageMemoryRequirements2) \ USE_VK_FUNC(vkGetImageMemoryRequirements2) \
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
"file_format_version": "1.0.0", "file_format_version": "1.0.0",
"ICD": { "ICD": {
"library_path": ".\\winevulkan.dll", "library_path": ".\\winevulkan.dll",
"api_version": "1.3.221" "api_version": "1.3.224"
} }
} }
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