zink: use int assignment for vk int type
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Thu, 18 Jun 2020 15:54:21 +0000 (11:54 -0400)
committerMarge Bot <eric+marge@anholt.net>
Fri, 19 Jun 2020 17:31:51 +0000 (17:31 +0000)
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>

src/gallium/drivers/zink/zink_draw.c

index 1699a7b601b6a647b96bb573389f6f791342a64d..7d73a1231ea5d745647366f27c524104deb68d7e 100644 (file)
@@ -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);
    }