From: Rob Clark <robdclark@gmail.com>
Date: Tue, 29 Jan 2019 17:21:19 +0000 (-0500)
Subject: freedreno/a5xx: fix blitter nr_samples check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9106a0fe335261b2bbfae02c23548abb0b555a34;p=mesa.git

freedreno/a5xx: fix blitter nr_samples check

nr_samples for non-MSAA case could be either zero or one.

Signed-off-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
index 0cfe92ac22f..da76afdfa60 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
@@ -122,7 +122,8 @@ can_do_blit(const struct pipe_blit_info *info)
 	debug_assert(info->dst.box.height >= 0);
 	debug_assert(info->dst.box.depth >= 0);
 
-	if (info->dst.resource->nr_samples + info->src.resource->nr_samples)
+	if ((info->dst.resource->nr_samples > 1) ||
+			(info->src.resource->nr_samples > 1))
 		return false;
 
 	if (info->scissor_enable)