From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 18 Jun 2020 15:54:21 +0000 (-0400)
Subject: zink: use int assignment for vk int type
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=292ade3c9d2e27c6af136299656d4946910da034;p=mesa.git

zink: use int assignment for vk int type

this breaks 32bit builds that use -Werror=int-conversion

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5545>
---

diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 1699a7b601b..7d73a1231ea 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -418,7 +418,7 @@ zink_draw_vbo(struct pipe_context *pctx,
             counter_buffers[i] = res->buffer;
             counter_buffer_offsets[i] = t->counter_buffer_offset;
          } else
-            counter_buffers[i] = NULL;
+            counter_buffers[i] = VK_NULL_HANDLE;
       }
       screen->vk_CmdBeginTransformFeedbackEXT(batch->cmdbuf, 0, ctx->num_so_targets, counter_buffers, counter_buffer_offsets);
    }