From 0ade32fbad4014efcc8aa8ed4cd0f8a39f9ab107 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 13 Jun 2012 14:28:43 +0100 Subject: sna: Fix operator preference around a | b & c | d Tell the compiler what we really mean is a | (b & (c | d)) Reported-by: Zdenek Kabelac Signed-off-by: Chris Wilson --- src/sna/sna_blt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c index 9ac67204..0cfa8b16 100644 --- a/src/sna/sna_blt.c +++ b/src/sna/sna_blt.c @@ -431,7 +431,7 @@ static void sna_blt_copy_one(struct sna *sna, /* Compare against a previous fill */ if (kgem->nbatch >= 6 && blt->overwrites && - kgem->batch[kgem->nbatch-6] == (XY_COLOR_BLT | (blt->cmd & BLT_WRITE_ALPHA | BLT_WRITE_RGB)) && + kgem->batch[kgem->nbatch-6] == (XY_COLOR_BLT | (blt->cmd & (BLT_WRITE_ALPHA | BLT_WRITE_RGB))) && kgem->batch[kgem->nbatch-4] == ((uint32_t)dst_y << 16 | (uint16_t)dst_x) && kgem->batch[kgem->nbatch-3] == ((uint32_t)(dst_y+height) << 16 | (uint16_t)(dst_x+width)) && kgem->reloc[kgem->nreloc-1].target_handle == blt->bo[1]->handle) { -- cgit v1.2.3