KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dzn: use updated tokens from vk.xml 

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17342>
This commit is contained in:
Eric Engestrom 2022-07-01 13:05:54 +01:00 committed by Marge Bot
parent 0225293a97
commit a96ddc3803
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/microsoft/vulkan/dzn_device.c
View File

@ -2454,7 +2454,7 @@ dzn_buffer_get_dxgi_format(VkFormat format)
D3D12_TEXTURE_COPY_LOCATION D3D12_TEXTURE_COPY_LOCATION
dzn_buffer_get_copy_loc(const struct dzn_buffer *buf, dzn_buffer_get_copy_loc(const struct dzn_buffer *buf,
VkFormat format, VkFormat format,
const VkBufferImageCopy2KHR *region, const VkBufferImageCopy2 *region,
VkImageAspectFlagBits aspect, VkImageAspectFlagBits aspect,
uint32_t layer) uint32_t layer)
{ {
@ -2495,7 +2495,7 @@ dzn_buffer_get_copy_loc(const struct dzn_buffer *buf,
D3D12_TEXTURE_COPY_LOCATION D3D12_TEXTURE_COPY_LOCATION
dzn_buffer_get_line_copy_loc(const struct dzn_buffer *buf, VkFormat format, 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, const D3D12_TEXTURE_COPY_LOCATION *loc,
uint32_t y, uint32_t z, uint32_t *start_x) uint32_t y, uint32_t z, uint32_t *start_x)
{ {

8
src/microsoft/vulkan/dzn_pipeline.c
View File

@ -1973,10 +1973,10 @@ dzn_CreateGraphicsPipelines(VkDevice dev,
/* Bail out on the first error != VK_PIPELINE_COMPILE_REQUIRED_EX as it /* 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. * 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; 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; break;
} }
} }
@ -2260,10 +2260,10 @@ dzn_CreateComputePipelines(VkDevice dev,
/* Bail out on the first error != VK_PIPELINE_COMPILE_REQUIRED_EX as it /* 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. * 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; 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; break;
} }
} }

4
src/microsoft/vulkan/dzn_private.h
View File

@ -963,13 +963,13 @@ dzn_buffer_get_dxgi_format(VkFormat format);
D3D12_TEXTURE_COPY_LOCATION D3D12_TEXTURE_COPY_LOCATION
dzn_buffer_get_copy_loc(const struct dzn_buffer *buf, VkFormat format, dzn_buffer_get_copy_loc(const struct dzn_buffer *buf, VkFormat format,
const VkBufferImageCopy2KHR *info, const VkBufferImageCopy2 *info,
VkImageAspectFlagBits aspect, VkImageAspectFlagBits aspect,
uint32_t layer); uint32_t layer);
D3D12_TEXTURE_COPY_LOCATION D3D12_TEXTURE_COPY_LOCATION
dzn_buffer_get_line_copy_loc(const struct dzn_buffer *buf, VkFormat format, 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, const D3D12_TEXTURE_COPY_LOCATION *loc,
uint32_t y, uint32_t z, uint32_t *start_x); uint32_t y, uint32_t z, uint32_t *start_x);