Avoids warnings on 32bit.
Signed-off-by: Grazvydas Ignotas <nota...@gmail.com>
---
src/amd/vulkan/radv_meta_bufimage.c | 8 ++++----
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 24e10b2..9f67a68 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 e43c6cf..d2b760e 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
};
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
