Mesa (master): zink: use int assignment for vk int type
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jun 19 17:44:09 UTC 2020
Module: Mesa
Branch: master
Commit: 292ade3c9d2e27c6af136299656d4946910da034
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=292ade3c9d2e27c6af136299656d4946910da034
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Thu Jun 18 11:54:21 2020 -0400
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 at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5545>
---
src/gallium/drivers/zink/zink_draw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
}
More information about the mesa-commit
mailing list