summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Isorce <j.isorce@samsung.com>2015-11-25 08:17:34 +0000
committerJulien Isorce <j.isorce@samsung.com>2015-11-25 08:17:39 +0000
commit63c344d179a8bbfd56c5c08f576be728bfb3d6b0 (patch)
tree04e17e20c4c4d2a5c36c96a9bce48830d7ff72d1
parent2bba2152e4ea10d4ae9b15795dc42e75bdc71bc2 (diff)
downloadexternal_mesa3d-63c344d179a8bbfd56c5c08f576be728bfb3d6b0.zip
external_mesa3d-63c344d179a8bbfd56c5c08f576be728bfb3d6b0.tar.gz
external_mesa3d-63c344d179a8bbfd56c5c08f576be728bfb3d6b0.tar.bz2
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@samsung.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
-rw-r--r--src/gallium/drivers/nouveau/nouveau_vp3_video.c2
1 files changed, 1 insertions, 1 deletions
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);