From c7a7e64ffac13d013091d66d24205451bfd6983d Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 13 Jan 2021 23:16:30 -0500 Subject: [PATCH] pan/bi: Fix assertion Fixes: bef3fedc814 ("pan/bi: Lower 8bit fragment outputs to 16bit") Signed-off-by: Alyssa Rosenzweig Reported-by: Coverity Reviewed-by: Boris Brezillon Part-of: (cherry picked from commit 81becaa685a71778e16ed0cc0c510186d5e682f5) --- .pick_status.json | 2 +- src/panfrost/bifrost/bifrost_compile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f96764d3fd4..1f2455314a8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -814,7 +814,7 @@ "description": "pan/bi: Fix assertion", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "bef3fedc8145c4030342f7c8f5cfc24c9df82909" }, diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 2e9c42a3efb..86cc1ec1e08 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -2135,7 +2135,7 @@ bifrost_nir_lower_i8_fragout_impl(struct nir_builder *b, nir_alu_type type = nir_alu_type_get_base_type(nir_intrinsic_src_type(intr)); - assert(type == nir_type_int || nir_type_uint); + assert(type == nir_type_int || type == nir_type_uint); b->cursor = nir_before_instr(instr); nir_ssa_def *cast = type == nir_type_int ?