radv/meta: use VK_NULL_HANDLE for handles

Otherwise we get 32bit warnings because handle is plain uint64_t there
and NULL is not suited to initialize that.

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

diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c
index 5a42fd894b1c0ac50a1fc246096b13587ff60003..6b622e782815c96d9f2108fb2a85acd03b156cb3 100644 (file)
--- a/src/amd/vulkan/radv_meta_blit2d.c
+++ b/src/amd/vulkan/radv_meta_blit2d.c
@@ -163,7 +163,7 @@ blit2d_bind_src(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->iview),
                                                                          .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
                                                                  },

diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c
index 01e48e43b46f7bb94d3d5613cbbf69165964b7cb..310771829bfad0c9f1ee6dbfbdaeb8a00a5b85a0 100644 (file)
--- a/src/amd/vulkan/radv_meta_bufimage.c
+++ b/src/amd/vulkan/radv_meta_bufimage.c
@@ -327,7 +327,7 @@ itob_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,
                                                          },

diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/radv_meta_resolve_cs.c
index 126823bb8f4cedac1b2f510fce9709429a7973eb..bfe4ceed8e6fc9b82c4fe6d887a8fff2d7ceb1ac 100644 (file)
--- a/src/amd/vulkan/radv_meta_resolve_cs.c
+++ b/src/amd/vulkan/radv_meta_resolve_cs.c
@@ -405,7 +405,7 @@ void radv_meta_resolve_compute_image(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(&src_iview),
                                                                  .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
                                                          },
@@ -420,7 +420,7 @@ void radv_meta_resolve_compute_image(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(&dest_iview),
                                                                  .imageLayout = VK_IMAGE_LAYOUT_GENERAL,
                                                          },