From ca92a0d1ae8d7d393643d8abef10288e95b5e7b2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 11 Sep 2021 11:57:37 -0400 Subject: [PATCH] zink: fix some return values the function used to return the layout directly Reviewed-by: Dave Airlie Part-of: --- 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 b7241d0..9a0025c 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); -- 2.7.4