From d1d14f20cfd6412adbd6f937f54c814c2a332e6f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 11 Nov 2016 09:00:15 +0000 Subject: [PATCH] brw_eu_emit.c: fix wrong test on a register type Caught by gcc-6 as: brw_eu_emit.c:180:49: warning: logical 'and' of equal expressions [-Wlogical-op] if (reg.file == BRW_ARCHITECTURE_REGISTER_FILE && reg.file == BRW_ARF_NULL) return; Change uses 'reg.nr' test for 'BRW_ARF_NULL'. Signed-off-by: Sergei Trofimovich Signed-off-by: Chris Wilson --- src/sna/brw/brw_eu_emit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sna/brw/brw_eu_emit.c b/src/sna/brw/brw_eu_emit.c index 2f33022a..154f939a 100644 --- a/src/sna/brw/brw_eu_emit.c +++ b/src/sna/brw/brw_eu_emit.c @@ -178,7 +178,7 @@ validate_reg(struct brw_instruction *insn, struct brw_reg reg) } if (reg.file == BRW_ARCHITECTURE_REGISTER_FILE && - reg.file == BRW_ARF_NULL) + reg.nr == BRW_ARF_NULL) return; assert(reg.hstride >= 0 && reg.hstride < ARRAY_SIZE(hstride_for_reg));