From: Rob Clark <robdclark@chromium.org>
Date: Wed, 26 Feb 2020 16:21:32 +0000 (-0800)
Subject: freedreno/ir3: fix assert with getinfo
X-Git-Tag: upstream/20.1.8~3020
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac705edd82996b4176de6a991db38e76a11625a7;p=platform%2Fupstream%2Fmesa.git

freedreno/ir3: fix assert with getinfo

Fixes:
dEQP-VK.glsl.texture_functions.query.texturesamples.sampler2dms_fixed_vertex

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3989>
---

diff --git a/src/freedreno/ir3/ir3.c b/src/freedreno/ir3/ir3.c
index f8cfc6b..0dbe9bb 100644
--- a/src/freedreno/ir3/ir3.c
+++ b/src/freedreno/ir3/ir3.c
@@ -462,7 +462,8 @@ static int emit_cat5(struct ir3_instruction *instr, void *ptr,
 	struct ir3_register *src2;
 	instr_cat5_t *cat5 = ptr;
 
-	iassert((instr->regs_count == 2) ||
+	iassert((instr->regs_count == 1) ||
+			(instr->regs_count == 2) ||
 			(instr->regs_count == 3) ||
 			(instr->regs_count == 4));
 
@@ -470,7 +471,7 @@ static int emit_cat5(struct ir3_instruction *instr, void *ptr,
 		src1 = instr->regs[2];
 		src2 = instr->regs_count > 3 ? instr->regs[3] : NULL;
 	} else {
-		src1 = instr->regs[1];
+		src1 = instr->regs_count > 1 ? instr->regs[1] : NULL;
 		src2 = instr->regs_count > 2 ? instr->regs[2] : NULL;
 	}