diff options
| author | Grazvydas Ignotas <[email protected]> | 2016-12-10 21:10:04 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2016-12-10 21:46:56 +0100 |
| commit | ec08666a2865423330a61b2a6a10ed7ab12e2a6f (patch) | |
| tree | 1b208ed158af9917af07c7b9378351e4f2e247b5 | |
| parent | 9bff2c98847e6ea3958411c2be70c3f5e1d70032 (diff) | |
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 <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_meta_blit2d.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_meta_bufimage.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_meta_resolve_cs.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c index 5a42fd894b1..6b622e78281 100644 --- 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 01e48e43b46..310771829bf 100644 --- 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 126823bb8f4..bfe4ceed8e6 100644 --- 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, }, |