Module: Mesa Branch: main Commit: ca92a0d1ae8d7d393643d8abef10288e95b5e7b2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca92a0d1ae8d7d393643d8abef10288e95b5e7b2
Author: Mike Blumenkrantz <[email protected]> Date: Sat Sep 11 11:57:37 2021 -0400 zink: fix some return values the function used to return the layout directly Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12844> --- src/gallium/drivers/zink/zink_descriptors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index b7241d0c2c1..9a0025ce25f 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -400,7 +400,7 @@ create_layout(struct zink_context *ctx, enum zink_descriptor_type type, struct zink_screen *screen = zink_screen(ctx->base.screen); VkDescriptorSetLayout dsl = descriptor_layout_create(screen, type, bindings, MAX2(num_bindings, 1)); if (!dsl) - return VK_NULL_HANDLE; + return NULL; struct zink_descriptor_layout_key *k = ralloc(ctx, struct zink_descriptor_layout_key); k->use_count = 0; @@ -410,7 +410,7 @@ create_layout(struct zink_context *ctx, enum zink_descriptor_type type, if (!k->bindings) { ralloc_free(k); VKSCR(DestroyDescriptorSetLayout)(screen->dev, dsl, NULL); - return VK_NULL_HANDLE; + return NULL; } memcpy(k->bindings, bindings, bindings_size);
