fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: remove a bunch of KHR alias uses

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41233>
This commit is contained in:
Lionel Landwerlin 2026-04-28 12:08:54 +03:00 • committed by Marge Bot
parent 4c7948ec0d
commit 5a462d77ff
11 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/intel/vulkan/anv_astc_emu.c
View file

@ -155,7 +155,7 @@ astc_emu_init_flush_denorm_pipeline_locked(struct anv_device *device)
if (astc_emu->ds_layout == VK_NULL_HANDLE) {
const VkDescriptorSetLayoutCreateInfo ds_layout_create_info = {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR,
.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT,
.bindingCount = 2,
.pBindings = (VkDescriptorSetLayoutBinding[]){
{
@ -299,18 +299,18 @@ astc_emu_flush_denorm_slice(struct anv_cmd_buffer *cmd_buffer,
VK_PIPELINE_BIND_POINT_COMPUTE,
astc_emu->pipeline);
VkPushConstantsInfoKHR push_info = {
.sType = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR,
VkPushConstantsInfo push_info = {
.sType = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO,
.layout = astc_emu->pipeline_layout,
.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
.offset = 0,
.size = sizeof(push_const),
.pValues = push_const,
};
anv_CmdPushConstants2KHR(cmd_buffer_, &push_info);
anv_CmdPushConstants2(cmd_buffer_, &push_info);
VkBindDescriptorSetsInfoKHR bind_info = {
.sType = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR,
VkBindDescriptorSetsInfo bind_info = {
.sType = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO,
.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
.layout = astc_emu->pipeline_layout,
.firstSet = 0,
@ -319,7 +319,7 @@ astc_emu_flush_denorm_slice(struct anv_cmd_buffer *cmd_buffer,
.dynamicOffsetCount = 0,
.pDynamicOffsets = NULL,
};
anv_CmdBindDescriptorSets2KHR(cmd_buffer_, &bind_info);
anv_CmdBindDescriptorSets2(cmd_buffer_, &bind_info);
/* each workgroup processes 8x8 texel blocks */
rect.extent.width = DIV_ROUND_UP(rect.extent.width, 8);
@ -371,8 +371,8 @@ astc_emu_decompress_slice(struct anv_cmd_buffer *cmd_buffer,
VkDescriptorSet set = anv_descriptor_set_to_handle(&push_set.set);
VkBindDescriptorSetsInfoKHR bind_info = {
.sType = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO_KHR,
VkBindDescriptorSetsInfo bind_info = {
.sType = VK_STRUCTURE_TYPE_BIND_DESCRIPTOR_SETS_INFO,
.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
.layout = astc_emu->texcompress->p_layout,
.firstSet = 0,
@ -381,7 +381,7 @@ astc_emu_decompress_slice(struct anv_cmd_buffer *cmd_buffer,
.dynamicOffsetCount = 0,
.pDynamicOffsets = NULL,
};
anv_CmdBindDescriptorSets2KHR(cmd_buffer_, &bind_info);
anv_CmdBindDescriptorSets2(cmd_buffer_, &bind_info);
const uint32_t push_const[] = {
rect.offset.x,
@ -392,15 +392,15 @@ astc_emu_decompress_slice(struct anv_cmd_buffer *cmd_buffer,
vk_format_get_blockheight(astc_format),
false, /* we don't use VK_IMAGE_VIEW_TYPE_3D */
};
VkPushConstantsInfoKHR push_info = {
.sType = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR,
VkPushConstantsInfo push_info = {
.sType = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO,
.layout = astc_emu->texcompress->p_layout,
.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
.offset = 0,
.size = sizeof(push_const),
.pValues = push_const,
};
anv_CmdPushConstants2KHR(cmd_buffer_, &push_info);
anv_CmdPushConstants2(cmd_buffer_, &push_info);
/* each workgroup processes 2x2 texel blocks */
rect.extent.width = DIV_ROUND_UP(rect.extent.width, 2);

16
src/intel/vulkan/anv_buffer.c
View file

@ -14,8 +14,8 @@ anv_bind_buffer_memory(struct anv_device *device,
assert(pBindInfo->sType == VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO);
assert(!anv_buffer_is_sparse(buffer));
const VkBindMemoryStatusKHR *bind_status =
vk_find_struct_const(pBindInfo->pNext, BIND_MEMORY_STATUS_KHR);
const VkBindMemoryStatus *bind_status =
vk_find_struct_const(pBindInfo->pNext, BIND_MEMORY_STATUS);
if (mem) {
assert(pBindInfo->memoryOffset < mem->vk.size);
@ -61,7 +61,7 @@ static void
anv_get_buffer_memory_requirements(struct anv_device *device,
VkBufferCreateFlags flags,
VkDeviceSize size,
VkBufferUsageFlags2KHR usage,
VkBufferUsageFlags2 usage,
bool is_sparse,
VkMemoryRequirements2* pMemoryRequirements)
{
@ -135,12 +135,12 @@ anv_get_buffer_memory_requirements(struct anv_device *device,
}
}
static VkBufferUsageFlags2KHR
static VkBufferUsageFlags2
get_buffer_usages(const VkBufferCreateInfo *create_info)
{
const VkBufferUsageFlags2CreateInfoKHR *usage2_info =
const VkBufferUsageFlags2CreateInfo *usage2_info =
vk_find_struct_const(create_info->pNext,
BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR);
BUFFER_USAGE_FLAGS_2_CREATE_INFO);
return usage2_info != NULL ? usage2_info->usage : create_info->usage;
}
@ -152,7 +152,7 @@ void anv_GetDeviceBufferMemoryRequirements(
ANV_FROM_HANDLE(anv_device, device, _device);
const bool is_sparse =
pInfo->pCreateInfo->flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT;
VkBufferUsageFlags2KHR usages = get_buffer_usages(pInfo->pCreateInfo);
VkBufferUsageFlags2 usages = get_buffer_usages(pInfo->pCreateInfo);
if ((device->physical->sparse_type == ANV_SPARSE_TYPE_NOT_SUPPORTED) &&
INTEL_DEBUG(DEBUG_SPARSE) &&
@ -189,7 +189,7 @@ VkResult anv_CreateBuffer(
if ((pCreateInfo->flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) &&
device->physical->sparse_type == ANV_SPARSE_TYPE_TRTT) {
VkBufferUsageFlags2KHR usages = get_buffer_usages(pCreateInfo);
VkBufferUsageFlags2 usages = get_buffer_usages(pCreateInfo);
if (usages & (VK_BUFFER_USAGE_2_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT |
VK_BUFFER_USAGE_2_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT)) {
return vk_errorf(device, VK_ERROR_UNKNOWN,

4
src/intel/vulkan/anv_buffer_view.c
View file

@ -37,8 +37,8 @@ anv_CreateBufferView(VkDevice _device,
if (!view)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
const VkBufferUsageFlags2CreateInfoKHR *view_usage_info =
vk_find_struct_const(pCreateInfo->pNext, BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR);
const VkBufferUsageFlags2CreateInfo *view_usage_info =
vk_find_struct_const(pCreateInfo->pNext, BUFFER_USAGE_FLAGS_2_CREATE_INFO);
const VkBufferUsageFlags buffer_usage =
view_usage_info != NULL ? view_usage_info->usage : buffer->vk.usage;

26
src/intel/vulkan/anv_cmd_buffer.c
View file

@ -733,9 +733,9 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer,
pipe_state->push_constants_data_dirty = true;
}
void anv_CmdBindDescriptorSets2KHR(
void anv_CmdBindDescriptorSets2(
VkCommandBuffer commandBuffer,
const VkBindDescriptorSetsInfoKHR* pInfo)
const VkBindDescriptorSetsInfo* pInfo)
{
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(vk_pipeline_layout, layout, pInfo->layout);
@ -932,7 +932,7 @@ void anv_CmdBindVertexBuffers2(
}
}
void anv_CmdBindIndexBuffer2KHR(
void anv_CmdBindIndexBuffer2(
VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
@ -1139,9 +1139,9 @@ anv_cmd_buffer_cs_push_constants(struct anv_cmd_buffer *cmd_buffer)
return state;
}
void anv_CmdPushConstants2KHR(
void anv_CmdPushConstants2(
VkCommandBuffer commandBuffer,
const VkPushConstantsInfoKHR* pInfo)
const VkPushConstantsInfo* pInfo)
{
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
@ -1199,7 +1199,7 @@ anv_cmd_buffer_get_pipe_state(struct anv_cmd_buffer *cmd_buffer,
static void
anv_cmd_buffer_push_descriptor_sets(struct anv_cmd_buffer *cmd_buffer,
VkPipelineBindPoint bind_point,
const VkPushDescriptorSetInfoKHR *pInfo)
const VkPushDescriptorSetInfo *pInfo)
{
VK_FROM_HANDLE(vk_pipeline_layout, layout, pInfo->layout);
@ -1223,9 +1223,9 @@ anv_cmd_buffer_push_descriptor_sets(struct anv_cmd_buffer *cmd_buffer,
NULL, NULL);
}
void anv_CmdPushDescriptorSet2KHR(
void anv_CmdPushDescriptorSet2(
VkCommandBuffer commandBuffer,
const VkPushDescriptorSetInfoKHR* pInfo)
const VkPushDescriptorSetInfo* pInfo)
{
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
@ -1243,9 +1243,9 @@ void anv_CmdPushDescriptorSet2KHR(
pInfo);
}
void anv_CmdPushDescriptorSetWithTemplate2KHR(
void anv_CmdPushDescriptorSetWithTemplate2(
VkCommandBuffer commandBuffer,
const VkPushDescriptorSetWithTemplateInfoKHR* pInfo)
const VkPushDescriptorSetWithTemplateInfo* pInfo)
{
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(vk_descriptor_update_template, template,
@ -1425,15 +1425,15 @@ anv_cmd_buffer_restore_state(struct anv_cmd_buffer *cmd_buffer,
}
if (state->flags & ANV_CMD_SAVED_STATE_PUSH_CONSTANTS) {
VkPushConstantsInfoKHR push_info = {
.sType = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR,
VkPushConstantsInfo push_info = {
.sType = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO,
.layout = VK_NULL_HANDLE,
.stageFlags = stage_flags,
.offset = 0,
.size = sizeof(state->push_constants),
.pValues = state->push_constants,
};
anv_CmdPushConstants2KHR(cmd_buffer_, &push_info);
anv_CmdPushConstants2(cmd_buffer_, &push_info);
}
}

12
src/intel/vulkan/anv_descriptor_set.c
View file

@ -192,7 +192,7 @@ anv_direct_descriptor_data_for_type(const struct anv_physical_device *device,
}
if (layout_type == ANV_PIPELINE_DESCRIPTOR_SET_LAYOUT_TYPE_BUFFER) {
if (set_flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) {
if (set_flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT) {
/* Push descriptors are special with descriptor buffers. On Gfx12.5+
* they have their own pool and are not reachable by the binding
* table. On previous generations, they are only reachable through
@ -415,7 +415,7 @@ anv_descriptor_data_supports_bindless(const struct anv_physical_device *pdevice,
* tables.
*/
if (!intel_has_extended_bindless(&pdevice->info) &&
(set_flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)) {
(set_flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT)) {
return data & (ANV_DESCRIPTOR_INDIRECT_ADDRESS_RANGE |
ANV_DESCRIPTOR_INDIRECT_SAMPLED_IMAGE |
ANV_DESCRIPTOR_INDIRECT_STORAGE_IMAGE);
@ -451,7 +451,7 @@ anv_descriptor_requires_bindless(const struct anv_physical_device *pdevice,
if (ANV_DEBUG(BINDLESS))
return anv_descriptor_supports_bindless(pdevice, set, binding);
if (set->vk.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)
if (set->vk.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT)
return false;
if (set->vk.flags & (VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT |
@ -812,14 +812,14 @@ VkResult anv_CreateDescriptorSetLayout(
/* From the Vulkan spec:
*
* "If VkDescriptorSetLayoutCreateInfo::flags includes
* VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR, then
* VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT, then
* all elements of pBindingFlags must not include
* VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT,
* VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT, or
* VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT"
*/
if (pCreateInfo->flags &
VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) {
VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT) {
assert(!(set_layout->binding[b].flags &
(VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT |
VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT |
@ -1956,7 +1956,7 @@ anv_image_view_surface_data_for_plane_layout(struct anv_image_view *image_view,
desc_type == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE ||
desc_type == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT) {
return (layout == VK_IMAGE_LAYOUT_GENERAL ||
layout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR) ?
layout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ) ?
&image_view->planes[plane].general_sampler.state_data :
&image_view->planes[plane].optimal_sampler.state_data;
}

14
src/intel/vulkan/anv_device.c
View file

@ -1971,11 +1971,11 @@ void anv_FreeMemory(
pthread_mutex_unlock(&device->mutex);
if (mem->map) {
const VkMemoryUnmapInfoKHR unmap = {
.sType = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO_KHR,
const VkMemoryUnmapInfo unmap = {
.sType = VK_STRUCTURE_TYPE_MEMORY_UNMAP_INFO,
.memory = _mem,
};
anv_UnmapMemory2KHR(_device, &unmap);
anv_UnmapMemory2(_device, &unmap);
}
p_atomic_add(&device->physical->memory.heaps[mem->type->heapIndex].used,
@ -1991,9 +1991,9 @@ void anv_FreeMemory(
vk_device_memory_destroy(&device->vk, pAllocator, &mem->vk);
}
VkResult anv_MapMemory2KHR(
VkResult anv_MapMemory2(
VkDevice _device,
const VkMemoryMapInfoKHR* pMemoryMapInfo,
const VkMemoryMapInfo* pMemoryMapInfo,
void** ppData)
{
ANV_FROM_HANDLE(anv_device, device, _device);
@ -2065,9 +2065,9 @@ VkResult anv_MapMemory2KHR(
return VK_SUCCESS;
}
VkResult anv_UnmapMemory2KHR(
VkResult anv_UnmapMemory2(
VkDevice _device,
const VkMemoryUnmapInfoKHR* pMemoryUnmapInfo)
const VkMemoryUnmapInfo* pMemoryUnmapInfo)
{
ANV_FROM_HANDLE(anv_device, device, _device);
ANV_FROM_HANDLE(anv_device_memory, mem, pMemoryUnmapInfo->memory);

4
src/intel/vulkan/anv_formats.c
View file

@ -461,8 +461,8 @@ static const struct anv_format ycbcr_formats[] = {
};
static const struct anv_format maintenance5_formats[] = {
fmt1(VK_FORMAT_A8_UNORM_KHR, ISL_FORMAT_A8_UNORM),
swiz_fmt1(VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR, ISL_FORMAT_B5G5R5A1_UNORM, BGRA)
fmt1(VK_FORMAT_A8_UNORM, ISL_FORMAT_A8_UNORM),
swiz_fmt1(VK_FORMAT_A1B5G5R5_UNORM_PACK16, ISL_FORMAT_B5G5R5A1_UNORM, BGRA)
};
#undef _fmt

22
src/intel/vulkan/anv_image.c
View file

@ -3060,7 +3060,7 @@ anv_bind_image_memory(struct anv_device *device,
ANV_FROM_HANDLE(anv_image, image, bind_info->image);
bool did_bind = false;
VkResult result = VK_SUCCESS;
const VkBindMemoryStatusKHR *bind_status = NULL;
const VkBindMemoryStatus *bind_status = NULL;
assert(!anv_image_is_sparse(image));
@ -3161,8 +3161,8 @@ anv_bind_image_memory(struct anv_device *device,
break;
}
#pragma GCC diagnostic pop
case VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR: {
bind_status = (const VkBindMemoryStatusKHR *)s;
case VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS: {
bind_status = (const VkBindMemoryStatus *)s;
break;
}
default:
@ -3267,8 +3267,8 @@ VkResult anv_BindImageMemory2(
static void
anv_get_image_subresource_layout(struct anv_device *device,
const struct anv_image *image,
const VkImageSubresource2KHR *subresource,
VkSubresourceLayout2KHR *layout)
const VkImageSubresource2 *subresource,
VkSubresourceLayout2 *layout)
{
const struct isl_surf *isl_surf = NULL;
const struct anv_image_memory_range *mem_range;
@ -3436,10 +3436,10 @@ anv_get_image_subresource_layout(struct anv_device *device,
}
}
void anv_GetDeviceImageSubresourceLayoutKHR(
void anv_GetDeviceImageSubresourceLayout(
VkDevice _device,
const VkDeviceImageSubresourceInfoKHR* pInfo,
VkSubresourceLayout2KHR* pLayout)
const VkDeviceImageSubresourceInfo* pInfo,
VkSubresourceLayout2* pLayout)
{
ANV_FROM_HANDLE(anv_device, device, _device);
@ -3454,11 +3454,11 @@ void anv_GetDeviceImageSubresourceLayoutKHR(
anv_get_image_subresource_layout(device, &image, pInfo->pSubresource, pLayout);
}
void anv_GetImageSubresourceLayout2KHR(
void anv_GetImageSubresourceLayout2(
VkDevice _device,
VkImage _image,
const VkImageSubresource2KHR* pSubresource,
VkSubresourceLayout2KHR* pLayout)
const VkImageSubresource2* pSubresource,
VkSubresourceLayout2* pLayout)
{
ANV_FROM_HANDLE(anv_device, device, _device);
ANV_FROM_HANDLE(anv_image, image, _image);

4
src/intel/vulkan/anv_nir_apply_pipeline_layout.c
View file

@ -197,7 +197,7 @@ add_binding_type(struct apply_pipeline_layout_state *state,
/* We can't push descriptor buffers but we can for push descriptors */
const bool is_set_pushable =
(set_layout->vk.flags & non_pushable_set_flags) == 0 ||
set_layout->vk.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR;
set_layout->vk.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT;
const bool is_binding_pushable =
(bind_layout->flags & non_pushable_binding_flags) == 0;
@ -2014,7 +2014,7 @@ static bool
binding_is_promotable_to_push(const struct anv_descriptor_set_layout *set_layout,
const struct anv_descriptor_set_binding_layout *bind_layout)
{
if (set_layout->vk.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)
if (set_layout->vk.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT)
return true;
if (set_layout->vk.flags &

2
src/intel/vulkan/anv_nir_push_descriptor_analysis.c
View file

@ -35,7 +35,7 @@ anv_pipeline_layout_get_push_set(struct anv_descriptor_set_layout * const *set_l
if (!set_layout ||
!(set_layout->vk.flags &
VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR))
VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT))
continue;
if (set_idx)

6
src/intel/vulkan/genX_acceleration_structure.c
View file

@ -345,8 +345,8 @@ anv_bvh_build_set_args(VkCommandBuffer commandBuffer, const void *args,
vk_get_bvh_build_pipeline_layout(&device->vk, &device->meta_device, size,
&layout);
VkPushConstantsInfoKHR push_info = {
.sType = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO_KHR,
VkPushConstantsInfo push_info = {
.sType = VK_STRUCTURE_TYPE_PUSH_CONSTANTS_INFO,
.layout = layout,
.stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
.offset = 0,
@ -354,7 +354,7 @@ anv_bvh_build_set_args(VkCommandBuffer commandBuffer, const void *args,
.pValues = args,
};
anv_CmdPushConstants2KHR(commandBuffer, &push_info);
anv_CmdPushConstants2(commandBuffer, &push_info);
}
static VkResult