diff options
| author | Grazvydas Ignotas <[email protected]> | 2017-03-05 23:04:53 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2017-03-06 00:10:42 +0100 |
| commit | 6aaadd8728d4c614623de390fca8937424ecc5fb (patch) | |
| tree | 5262894560d2b90ab8fed2093f39547896e9559e | |
| parent | a5446e3187ecaca5212e37a502c0145cc0299c47 (diff) | |
radv: use VK_NULL_HANDLE for handles
Avoids warnings on 32bit.
Signed-off-by: Grazvydas Ignotas <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_meta_bufimage.c | 8 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_wsi.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c index 24e10b25188..9f67a686e36 100644 --- 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 e43c6cfd410..d2b760e9356 100644 --- 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 }; |