Module: Mesa Branch: master Commit: 3aa2da96df80a1fe57169d82e6604694d0601561 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3aa2da96df80a1fe57169d82e6604694d0601561
Author: Mike Blumenkrantz <[email protected]> Date: Tue Mar 16 11:10:09 2021 -0400 zink: add missing null check mismerged from an earlier patch... Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9623> --- src/gallium/drivers/zink/zink_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 3d8c53da12f..149c636f7ec 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -63,7 +63,7 @@ get_resource_for_descriptor(struct zink_context *ctx, enum zink_descriptor_type case ZINK_DESCRIPTOR_TYPE_SSBO: return zink_resource(ctx->ssbos[shader][idx].buffer); case ZINK_DESCRIPTOR_TYPE_SAMPLER_VIEW: - return zink_resource(ctx->sampler_views[shader][idx]->texture); + return ctx->sampler_views[shader][idx] ? zink_resource(ctx->sampler_views[shader][idx]->texture) : NULL; case ZINK_DESCRIPTOR_TYPE_IMAGE: return zink_resource(ctx->image_views[shader][idx].base.resource); default: _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
