aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <[email protected]>2020-06-18 11:54:21 -0400
committerMarge Bot <[email protected]>2020-06-19 17:31:51 +0000
commit292ade3c9d2e27c6af136299656d4946910da034 (patch)
tree14a0ef2acc23baa67e35df70073fbc4a451a08b3
parent8f11cc4cad7feb8d78f37709baac36c6a22034c6 (diff)
zink: use int assignment for vk int type
this breaks 32bit builds that use -Werror=int-conversion Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5545>
-rw-r--r--src/gallium/drivers/zink/zink_draw.c2
1 files changed, 1 insertions, 1 deletions
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);
}