Mesa (master): freedreno/a5xx: fix blitter nr_samples check

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9106a0fe335261b2bbfae02c23548abb0b555a34
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9106a0fe335261b2bbfae02c23548abb0b555a34

Author: Rob Clark <robdclark at gmail.com>
Date:   Tue Jan 29 12:21:19 2019 -0500

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 at gmail.com>

---

 src/gallium/drivers/freedreno/a5xx/fd5_blitter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
index 0cfe92ac22..da76afdfa6 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)