Mesa (master): etnaviv: remove bogus assert

Christian Gmeiner austriancoder at kemper.freedesktop.org
Fri Jun 16 13:26:54 UTC 2017


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

Author: Lucas Stach <dev at lynxeye.de>
Date:   Sun Jun  4 21:06:30 2017 +0200

etnaviv: remove bogus assert

etna_resource_copy_region handles resources with multiple samples
by falling back to the software path. There is no need to kill the
application there.

Fixes: c9e8b49b ("etnaviv: gallium driver for Vivante GPUs")
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Lucas Stach <dev at lynxeye.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>

---

 src/gallium/drivers/etnaviv/etnaviv_clear_blit.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
index e350b96244..225073dd66 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
@@ -285,8 +285,6 @@ etna_resource_copy_region(struct pipe_context *pctx, struct pipe_resource *dst,
 
    /* The resource must be of the same format. */
    assert(src->format == dst->format);
-   /* Resources with nr_samples > 1 are not allowed. */
-   assert(src->nr_samples <= 1 && dst->nr_samples <= 1);
 
    /* XXX we can use the RS as a literal copy engine here
     * the only complexity is tiling; the size of the boxes needs to be aligned




More information about the mesa-commit mailing list