summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrazvydas Ignotas <[email protected]>2018-08-21 00:36:58 +0300
committerGrazvydas Ignotas <[email protected]>2018-08-23 00:34:32 +0300
commit0076ea92a9d76fc6cae1a83fb3a8c1c30d0fcbae (patch)
treea09fefdc2e674b4173661f111cff774f1ae33c3b
parent9177074524f0b5a2b55726ec43ee64a14c4446d5 (diff)
vulkan/wsi: fix pointer-integer conversion warnings
For 32bit build. Trivial. Reviewed-by: Bas Nieuwenhuizen <[email protected]>
-rw-r--r--src/vulkan/wsi/wsi_common_display.c4
-rw-r--r--src/vulkan/wsi/wsi_common_x11.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vulkan/wsi/wsi_common_display.c b/src/vulkan/wsi/wsi_common_display.c
index e6cba188dfa..1e90bba460c 100644
--- a/src/vulkan/wsi/wsi_common_display.c
+++ b/src/vulkan/wsi/wsi_common_display.c
@@ -1517,7 +1517,7 @@ wsi_register_vblank_event(struct wsi_display_fence *fence,
flags,
frame_requested,
frame_queued,
- (uint64_t) fence);
+ (uintptr_t) fence);
if (!ret)
return VK_SUCCESS;
@@ -2342,7 +2342,7 @@ wsi_get_randr_output_display(VkPhysicalDevice physical_device,
if (connector)
*display = wsi_display_connector_to_handle(connector);
else
- *display = NULL;
+ *display = VK_NULL_HANDLE;
return VK_SUCCESS;
}
diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 7b930884b47..aaa4d1e658e 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -1325,7 +1325,7 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
* mode which provokes reallocation when anything changes, to make
* sure we have the most optimal allocation.
*/
- struct x11_swapchain *old_chain = (void *) pCreateInfo->oldSwapchain;
+ struct x11_swapchain *old_chain = (void *)(intptr_t) pCreateInfo->oldSwapchain;
if (old_chain)
chain->last_present_mode = old_chain->last_present_mode;
else