diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-13 14:28:43 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-13 14:34:22 +0100 |
| commit | 0ade32fbad4014efcc8aa8ed4cd0f8a39f9ab107 (patch) | |
| tree | abd9ce8e483ef840387a98dc24af0ba30592f1da /src | |
| parent | 20f3114ccd63052b4fd06ef1d87efaaabbbac7ac (diff) | |
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 <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_blt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |