From a96ddc380343d9d5481d2598c8e0ff3f71812d4c Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 1 Jul 2022 13:05:54 +0100 Subject: [PATCH] dzn: use updated tokens from vk.xml Signed-off-by: Eric Engestrom Reviewed-by: Jesse Natalie Acked-by: Jason Ekstrand Part-of: --- src/microsoft/vulkan/dzn_device.c | 4 ++-- src/microsoft/vulkan/dzn_pipeline.c | 8 ++++---- src/microsoft/vulkan/dzn_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c index 98abf3b6aa9..db20d7e9672 100644 --- a/src/microsoft/vulkan/dzn_device.c +++ b/src/microsoft/vulkan/dzn_device.c @@ -2454,7 +2454,7 @@ dzn_buffer_get_dxgi_format(VkFormat format) D3D12_TEXTURE_COPY_LOCATION dzn_buffer_get_copy_loc(const struct dzn_buffer *buf, VkFormat format, - const VkBufferImageCopy2KHR *region, + const VkBufferImageCopy2 *region, VkImageAspectFlagBits aspect, uint32_t layer) { @@ -2495,7 +2495,7 @@ dzn_buffer_get_copy_loc(const struct dzn_buffer *buf, D3D12_TEXTURE_COPY_LOCATION dzn_buffer_get_line_copy_loc(const struct dzn_buffer *buf, VkFormat format, - const VkBufferImageCopy2KHR *region, + const VkBufferImageCopy2 *region, const D3D12_TEXTURE_COPY_LOCATION *loc, uint32_t y, uint32_t z, uint32_t *start_x) { diff --git a/src/microsoft/vulkan/dzn_pipeline.c b/src/microsoft/vulkan/dzn_pipeline.c index ec675fa8ffd..52176bd93f6 100644 --- a/src/microsoft/vulkan/dzn_pipeline.c +++ b/src/microsoft/vulkan/dzn_pipeline.c @@ -1973,10 +1973,10 @@ dzn_CreateGraphicsPipelines(VkDevice dev, /* Bail out on the first error != VK_PIPELINE_COMPILE_REQUIRED_EX as it * is not obvious what error should be report upon 2 different failures. */ - if (result != VK_PIPELINE_COMPILE_REQUIRED_EXT) + if (result != VK_PIPELINE_COMPILE_REQUIRED) break; - if (pCreateInfos[i].flags & VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT) + if (pCreateInfos[i].flags & VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT) break; } } @@ -2260,10 +2260,10 @@ dzn_CreateComputePipelines(VkDevice dev, /* Bail out on the first error != VK_PIPELINE_COMPILE_REQUIRED_EX as it * is not obvious what error should be report upon 2 different failures. */ - if (result != VK_PIPELINE_COMPILE_REQUIRED_EXT) + if (result != VK_PIPELINE_COMPILE_REQUIRED) break; - if (pCreateInfos[i].flags & VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT) + if (pCreateInfos[i].flags & VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT) break; } } diff --git a/src/microsoft/vulkan/dzn_private.h b/src/microsoft/vulkan/dzn_private.h index 9e9ee55d897..dc017f3b43d 100644 --- a/src/microsoft/vulkan/dzn_private.h +++ b/src/microsoft/vulkan/dzn_private.h @@ -963,13 +963,13 @@ dzn_buffer_get_dxgi_format(VkFormat format); D3D12_TEXTURE_COPY_LOCATION dzn_buffer_get_copy_loc(const struct dzn_buffer *buf, VkFormat format, - const VkBufferImageCopy2KHR *info, + const VkBufferImageCopy2 *info, VkImageAspectFlagBits aspect, uint32_t layer); D3D12_TEXTURE_COPY_LOCATION dzn_buffer_get_line_copy_loc(const struct dzn_buffer *buf, VkFormat format, - const VkBufferImageCopy2KHR *region, + const VkBufferImageCopy2 *region, const D3D12_TEXTURE_COPY_LOCATION *loc, uint32_t y, uint32_t z, uint32_t *start_x);