Mesa (main): radv: convert remaining enums/structs to 1.2 versions

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 8e5bb2d6ac533d94e03173e2c853dc7c51d381bf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e5bb2d6ac533d94e03173e2c853dc7c51d381bf

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Nov 19 17:02:43 2021 +0100

radv: convert remaining enums/structs to 1.2 versions

Some were missing.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13882>

---

 src/amd/vulkan/radv_device.c | 6 +++---
 src/amd/vulkan/radv_image.c  | 4 ++--
 src/amd/vulkan/radv_pass.c   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 039c7929907..816a7f6a9ca 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -6047,7 +6047,7 @@ radv_destroy_semaphore_part(struct radv_device *device, struct radv_semaphore_pa
    part->kind = RADV_SEMAPHORE_NONE;
 }
 
-static VkSemaphoreTypeKHR
+static VkSemaphoreType
 radv_get_semaphore_type(const void *pNext, uint64_t *initial_value)
 {
    const VkSemaphoreTypeCreateInfo *type_info =
@@ -6077,7 +6077,7 @@ radv_CreateSemaphore(VkDevice _device, const VkSemaphoreCreateInfo *pCreateInfo,
 {
    RADV_FROM_HANDLE(radv_device, device, _device);
    uint64_t initial_value = 0;
-   VkSemaphoreTypeKHR type = radv_get_semaphore_type(pCreateInfo->pNext, &initial_value);
+   VkSemaphoreType type = radv_get_semaphore_type(pCreateInfo->pNext, &initial_value);
 
    struct radv_semaphore *sem =
       vk_alloc2(&device->vk.alloc, pAllocator, sizeof(*sem), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
@@ -7651,7 +7651,7 @@ radv_GetPhysicalDeviceExternalSemaphoreProperties(
    VkExternalSemaphoreProperties *pExternalSemaphoreProperties)
 {
    RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice);
-   VkSemaphoreTypeKHR type = radv_get_semaphore_type(pExternalSemaphoreInfo->pNext, NULL);
+   VkSemaphoreType type = radv_get_semaphore_type(pExternalSemaphoreInfo->pNext, NULL);
 
    if (type == VK_SEMAPHORE_TYPE_TIMELINE && pdevice->rad_info.has_timeline_syncobj &&
        pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) {
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 55601f5a604..87640d10b1e 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -2098,8 +2098,8 @@ radv_layout_is_htile_compressed(const struct radv_device *device, const struct r
 {
    switch (layout) {
    case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL:
-   case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR:
-   case VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR:
+   case VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL:
+   case VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL:
       return radv_image_has_htile(image);
    case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL:
       return radv_image_is_tc_compat_htile(image) ||
diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c
index 840105a3fba..4935600b27f 100644
--- a/src/amd/vulkan/radv_pass.c
+++ b/src/amd/vulkan/radv_pass.c
@@ -144,7 +144,7 @@ radv_render_pass_add_implicit_deps(struct radv_render_pass *pass)
       }
 
       if (add_ingoing_dep) {
-         const VkSubpassDependency2KHR implicit_ingoing_dep = {
+         const VkSubpassDependency2 implicit_ingoing_dep = {
             .srcSubpass = VK_SUBPASS_EXTERNAL,
             .dstSubpass = i, /* first subpass attachment is used in */
             .srcStageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
@@ -161,7 +161,7 @@ radv_render_pass_add_implicit_deps(struct radv_render_pass *pass)
       }
 
       if (add_outgoing_dep) {
-         const VkSubpassDependency2KHR implicit_outgoing_dep = {
+         const VkSubpassDependency2 implicit_outgoing_dep = {
             .srcSubpass = i, /* last subpass attachment is used in */
             .dstSubpass = VK_SUBPASS_EXTERNAL,
             .srcStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,