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

nvk: update symbols that have become aliases for newer ones

Browse source 
All of these have been renamed in the spec (usually by being promoted);
renamed them in our code too.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26492>
This commit is contained in:
Eric Engestrom 2023-12-03 19:41:49 +00:00 • committed by Marge Bot
parent 5cb20b5edc
commit ddc6bd11df
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nouveau/vulkan/nvk_descriptor_set.c
View file

@ -477,7 +477,7 @@ nvk_descriptor_set_create(struct nvk_device *dev,
if (layout->binding_count > 0 &&
(layout->binding[layout->binding_count - 1].flags &
VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT)) {
VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT)) {
uint32_t stride = layout->binding[layout->binding_count-1].stride;
set->size += stride * variable_count;
}
@ -509,7 +509,7 @@ nvk_descriptor_set_create(struct nvk_device *dev,
uint32_t array_size = layout->binding[b].array_size;
if (layout->binding[b].flags &
VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT)
VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT)
array_size = variable_count;
for (uint32_t j = 0; j < array_size; j++)

2
src/nouveau/vulkan/nvk_descriptor_set_layout.c
View file

@ -87,7 +87,7 @@ nvk_descriptor_get_type_list(VkDescriptorType type,
const VkMutableDescriptorTypeCreateInfoEXT *info,
const uint32_t info_idx)
{
const VkMutableDescriptorTypeListVALVE *type_list = NULL;
const VkMutableDescriptorTypeListEXT *type_list = NULL;
if (type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT) {
assert(info != NULL);
assert(info_idx < info->mutableDescriptorTypeListCount);

4
src/nouveau/vulkan/nvk_device_memory.c
View file

@ -118,7 +118,7 @@ nvk_GetMemoryFdPropertiesKHR(VkDevice device,
struct nouveau_ws_bo *bo;
switch (handleType) {
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
bo = nouveau_ws_bo_from_dma_buf(dev->ws_dev, fd);
if (bo == NULL)
@ -368,7 +368,7 @@ nvk_GetMemoryFdKHR(VkDevice device,
VK_FROM_HANDLE(nvk_device_memory, memory, pGetFdInfo->memory);
switch (pGetFdInfo->handleType) {
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT:
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
if (nouveau_ws_bo_dma_buf(memory->bo, pFD))
return vk_error(dev, VK_ERROR_TOO_MANY_OBJECTS);

2
src/nouveau/vulkan/nvk_event.c
View file

@ -102,7 +102,7 @@ clear_bits64(uint64_t *bitfield, uint64_t bits)
uint32_t
vk_stage_flags_to_nv9097_pipeline_location(VkPipelineStageFlags2 flags)
{
if (clear_bits64(&flags, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR |
if (clear_bits64(&flags, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT |
VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT |
VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT |
VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT |

4
src/nouveau/vulkan/nvk_format.c
View file

@ -174,8 +174,8 @@ nvk_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice,
vk_foreach_struct(ext, pFormatProperties->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3_KHR: {
VkFormatProperties3KHR *p = (void *)ext;
case VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3: {
VkFormatProperties3 *p = (void *)ext;
p->linearTilingFeatures = linear2;
p->optimalTilingFeatures = optimal2;
p->bufferFeatures = buffer2;

12
src/nouveau/vulkan/nvk_image.c
View file

@ -140,16 +140,16 @@ nvk_get_image_format_features(struct nvk_physical_device *pdev,
return features;
}
static VkFormatFeatureFlags2KHR
static VkFormatFeatureFlags2
vk_image_usage_to_format_features(VkImageUsageFlagBits usage_flag)
{
assert(util_bitcount(usage_flag) == 1);
switch (usage_flag) {
case VK_IMAGE_USAGE_TRANSFER_SRC_BIT:
return VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR |
return VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT |
VK_FORMAT_FEATURE_BLIT_SRC_BIT;
case VK_IMAGE_USAGE_TRANSFER_DST_BIT:
return VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR |
return VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT |
VK_FORMAT_FEATURE_BLIT_DST_BIT;
case VK_IMAGE_USAGE_SAMPLED_BIT:
return VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT;
@ -282,7 +282,7 @@ nvk_GetPhysicalDeviceImageFormatProperties2(
view_usage = 0;
u_foreach_bit(b, view_usage) {
VkFormatFeatureFlags2KHR usage_features =
VkFormatFeatureFlags2 usage_features =
vk_image_usage_to_format_features(1 << b);
if (usage_features && !(features & usage_features))
return VK_ERROR_FORMAT_NOT_SUPPORTED;
@ -724,7 +724,7 @@ nvk_GetImageMemoryRequirements2(VkDevice device,
VKAPI_ATTR void VKAPI_CALL
nvk_GetDeviceImageMemoryRequirements(VkDevice device,
const VkDeviceImageMemoryRequirementsKHR *pInfo,
const VkDeviceImageMemoryRequirements *pInfo,
VkMemoryRequirements2 *pMemoryRequirements)
{
VK_FROM_HANDLE(nvk_device, dev, device);
@ -755,7 +755,7 @@ nvk_GetImageSparseMemoryRequirements2(VkDevice device,
VKAPI_ATTR void VKAPI_CALL
nvk_GetDeviceImageSparseMemoryRequirements(VkDevice device,
const VkDeviceImageMemoryRequirementsKHR* pInfo,
const VkDeviceImageMemoryRequirements* pInfo,
uint32_t *pSparseMemoryRequirementCount,
VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements)
{