Mesa (master): nouveau: move interlaced assert down in nouveau_vp3_video_buffer_create

Julien Isorce cap at kemper.freedesktop.org
Wed Nov 25 08:20:28 UTC 2015


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

Author: Julien Isorce <j.isorce at samsung.com>
Date:   Wed Nov 25 08:17:34 2015 +0000

nouveau: move interlaced assert down in nouveau_vp3_video_buffer_create

templat->interlaced is 0 if not NV12 which is the case currently
when using VPP.

Signed-off-by: Julien Isorce <j.isorce at samsung.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/nouveau/nouveau_vp3_video.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c b/src/gallium/drivers/nouveau/nouveau_vp3_video.c
index 4652e56..d76d932 100644
--- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c
+++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c
@@ -83,10 +83,10 @@ nouveau_vp3_video_buffer_create(struct pipe_context *pipe,
    struct pipe_sampler_view sv_templ;
    struct pipe_surface surf_templ;
 
-   assert(templat->interlaced);
    if (getenv("XVMC_VL") || templat->buffer_format != PIPE_FORMAT_NV12)
       return vl_video_buffer_create(pipe, templat);
 
+   assert(templat->interlaced);
    assert(templat->chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420);
 
    buffer = CALLOC_STRUCT(nouveau_vp3_video_buffer);




More information about the mesa-commit mailing list