Mesa (master): nvc0: kill assert in ppp code

Maarten Lankhorst mlankhorst at kemper.freedesktop.org
Wed Jun 19 11:10:02 UTC 2013


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

Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Date:   Wed Jun 19 13:08:51 2013 +0200

nvc0: kill assert in ppp code

It's no longer always true, and the video tilign aligment should
ensure the alignment is handled correctly regardless.

---

 src/gallium/drivers/nvc0/nvc0_video_ppp.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nvc0/nvc0_video_ppp.c b/src/gallium/drivers/nvc0/nvc0_video_ppp.c
index 35cea62..b536912 100644
--- a/src/gallium/drivers/nvc0/nvc0_video_ppp.c
+++ b/src/gallium/drivers/nvc0/nvc0_video_ppp.c
@@ -62,8 +62,6 @@ nvc0_decoder_setup_ppp(struct nvc0_decoder *dec, struct nvc0_video_buffer *targe
    PUSH_DATA (push, in_addr + y2); // 70c
    PUSH_DATA (push, in_addr + cbcr); // 710
    PUSH_DATA (push, in_addr + cbcr2); // 714
-   assert(target->resources[0]->width0 >= 16 * dec_w);
-   assert(target->resources[0]->height0 >= dec->base.height/2);
 
    for (i = 0; i < 2; ++i) {
       struct nv50_miptree *mt = (struct nv50_miptree *)target->resources[i];




More information about the mesa-commit mailing list