From 69dc0f2f7490920fc16dfa8b6a33b6c2acc8b98b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 2 Jul 2020 12:39:09 -0400 Subject: [PATCH] zink: assert valid format in zink_create_sampler_view() catch issues higher up the stack here Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/zink/zink_context.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 1b0aaf5..46545b7 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -266,6 +266,7 @@ zink_create_sampler_view(struct pipe_context *pctx, struct pipe_resource *pres, ivci.image = res->image; ivci.viewType = image_view_type(state->target); ivci.format = zink_get_format(screen, state->format); + assert(ivci.format); ivci.components.r = component_mapping(state->swizzle_r); ivci.components.g = component_mapping(state->swizzle_g); ivci.components.b = component_mapping(state->swizzle_b); @@ -283,6 +284,7 @@ zink_create_sampler_view(struct pipe_context *pctx, struct pipe_resource *pres, bvci.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; bvci.buffer = res->buffer; bvci.format = zink_get_format(screen, state->format); + assert(bvci.format); bvci.offset = state->u.buf.offset; bvci.range = state->u.buf.size; -- 2.7.4