From: Rob Clark Date: Tue, 29 Jan 2019 17:22:08 +0000 (-0500) Subject: freedreno/a6xx: fix blitter nr_samples check X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1a6ddfe5ee1fc4b850f82f9cc3b0248101cae55a;p=mesa.git freedreno/a6xx: fix blitter nr_samples check nr_samples for non-MSAA case could be either zero or one. Signed-off-by: Rob Clark --- diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c index 3e14e71933d..460255f748a 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c @@ -113,7 +113,9 @@ can_do_blit(const struct pipe_blit_info *info) debug_assert(info->dst.box.height >= 0); debug_assert(info->dst.box.depth >= 0); - fail_if(info->dst.resource->nr_samples + info->src.resource->nr_samples > 2); + /* non-multisampled could either have nr_samples == 0 or == 1 */ + fail_if(info->dst.resource->nr_samples > 1); + fail_if(info->src.resource->nr_samples > 1); fail_if(info->window_rectangle_include);