summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2013-08-17 10:53:09 -0400
committerIan Romanick <[email protected]>2013-08-19 16:39:43 -0700
commit5b8c943eb23fbe1eca9a60895db853bb32a58bcc (patch)
tree04616313f1eaf400b67fc5a312309a1525ecb160
parentd72f7720a6de538da21d883688d34bbaf656b542 (diff)
nv50: allow non-nv12 buffers to be created, just pass them through to vl
Since we expose non-NV12 formats as supported when there is no decoer profile selected, make sure that those formats are actually allowed to be allocated. Signed-off-by: Ilia Mirkin <[email protected]> Tested-by: Emil Velikov <[email protected]> Cc: "9.2" <[email protected]> (cherry picked from commit a8346a2f52d08233d376db3aa8205d0b2cc74318)
-rw-r--r--src/gallium/drivers/nv50/nv84_video.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv50/nv84_video.c b/src/gallium/drivers/nv50/nv84_video.c
index d5f6295a850..5c634330433 100644
--- a/src/gallium/drivers/nv50/nv84_video.c
+++ b/src/gallium/drivers/nv50/nv84_video.c
@@ -624,17 +624,13 @@ nv84_video_buffer_create(struct pipe_context *pipe,
union nouveau_bo_config cfg;
unsigned bo_size;
- if (getenv("XVMC_VL"))
+ if (getenv("XVMC_VL") || template->buffer_format != PIPE_FORMAT_NV12)
return vl_video_buffer_create(pipe, template);
if (!template->interlaced) {
debug_printf("Require interlaced video buffers\n");
return NULL;
}
- if (template->buffer_format != PIPE_FORMAT_NV12) {
- debug_printf("Must use NV12 format\n");
- return NULL;
- }
if (template->chroma_format != PIPE_VIDEO_CHROMA_FORMAT_420) {
debug_printf("Must use 4:2:0 format\n");
return NULL;