radv: use VK_NULL_HANDLE for handles

Avoids warnings on 32bit.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c
index 24e10b25188a09e1871f5096441bc8b30c1e3f84..9f67a686e36676ddd5e6f4469cd69d39574be093 100644 (file)
--- a/src/amd/vulkan/radv_meta_bufimage.c
+++ b/src/amd/vulkan/radv_meta_bufimage.c
@@ -1014,7 +1014,7 @@ btoi_bind_descriptors(struct radv_cmd_buffer *cmd_buffer,
                                                  .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
                                                  .pImageInfo = (VkDescriptorImageInfo[]) {
                                                          {
-                                                                 .sampler = NULL,
+                                                                 .sampler = VK_NULL_HANDLE,
                                                                  .imageView = radv_image_view_to_handle(&tmp->dst_iview),
                                                                  .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
                                                          },
@@ -1101,7 +1101,7 @@ itoi_bind_descriptors(struct radv_cmd_buffer *cmd_buffer,
                                                  .descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
                                                  .pImageInfo = (VkDescriptorImageInfo[]) {
                                                          {
-                                                                 .sampler = NULL,
+                                                                 .sampler = VK_NULL_HANDLE,
                                                                  .imageView = radv_image_view_to_handle(&tmp->src_iview),
                                                                  .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
                                                          },
@@ -1116,7 +1116,7 @@ itoi_bind_descriptors(struct radv_cmd_buffer *cmd_buffer,
                                                  .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
                                                  .pImageInfo = (VkDescriptorImageInfo[]) {
                                                          {
-                                                                 .sampler = NULL,
+                                                                 .sampler = VK_NULL_HANDLE,
                                                                  .imageView = radv_image_view_to_handle(&tmp->dst_iview),
                                                                  .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
                                                          },
@@ -1204,7 +1204,7 @@ cleari_bind_descriptors(struct radv_cmd_buffer *cmd_buffer,
                                                  .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
                                                  .pImageInfo = (VkDescriptorImageInfo[]) {
                                                          {
-                                                                 .sampler = NULL,
+                                                                 .sampler = VK_NULL_HANDLE,
                                                                  .imageView = radv_image_view_to_handle(&tmp->dst_iview),
                                                                  .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
                                                          },

diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c
index e43c6cfd4104f5ffe095fa5b88c8f647e74e23a1..d2b760e935662ec92147f7b030810340e0004659 100644 (file)
--- a/src/amd/vulkan/radv_wsi.c
+++ b/src/amd/vulkan/radv_wsi.c
@@ -187,7 +187,7 @@ radv_wsi_image_create(VkDevice device_h,
        const VkDedicatedAllocationMemoryAllocateInfoNV ded_alloc = {
                .sType = VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV,
                .pNext = NULL,
-               .buffer = NULL,
+               .buffer = VK_NULL_HANDLE,
                .image = image_h
        };