From f3c3b8cf2aea12245f87e70d9f007e6260d3a6db Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Fri, 3 Jun 2022 16:26:11 +0200 Subject: [PATCH] zink: Use VK_USE_64_BIT_PTR_DEFINES to check for 64bit platforms. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6605 Cc: mesa-stable Signed-off-by: Georg Lehmann Reviewed-By: Mike Blumenkrantz --- src/gallium/drivers/zink/zink_framebuffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/zink_framebuffer.c b/src/gallium/drivers/zink/zink_framebuffer.c index 852c99bcb69..84f410d60f7 100644 --- a/src/gallium/drivers/zink/zink_framebuffer.c +++ b/src/gallium/drivers/zink/zink_framebuffer.c @@ -37,7 +37,7 @@ zink_destroy_framebuffer(struct zink_screen *screen, struct zink_framebuffer *fb) { hash_table_foreach(&fb->objects, he) { -#if defined(_WIN64) || defined(__x86_64__) +#if VK_USE_64_BIT_PTR_DEFINES VKSCR(DestroyFramebuffer)(screen->dev, he->data, NULL); #else VkFramebuffer *ptr = he->data; @@ -60,7 +60,7 @@ zink_init_framebuffer(struct zink_screen *screen, struct zink_framebuffer *fb, s struct hash_entry *he = _mesa_hash_table_search_pre_hashed(&fb->objects, hash, rp); if (he) { -#if defined(_WIN64) || defined(__x86_64__) +#if VK_USE_64_BIT_PTR_DEFINES ret = (VkFramebuffer)he->data; #else VkFramebuffer *ptr = he->data; @@ -90,7 +90,7 @@ zink_init_framebuffer(struct zink_screen *screen, struct zink_framebuffer *fb, s if (VKSCR(CreateFramebuffer)(screen->dev, &fci, NULL, &ret) != VK_SUCCESS) return; -#if defined(_WIN64) || defined(__x86_64__) +#if VK_USE_64_BIT_PTR_DEFINES _mesa_hash_table_insert_pre_hashed(&fb->objects, hash, rp, ret); #else VkFramebuffer *ptr = ralloc(fb, VkFramebuffer);