diff options
| author | Maarten Lankhorst <[email protected]> | 2011-09-10 09:55:55 +0200 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2011-09-10 14:22:11 -0400 |
| commit | 1465dc26a540e2b6f8a055cf0ab48f774a3775bf (patch) | |
| tree | 47b2cb4bc282b14c657a5df44924970816a21ae4 /src/gallium/drivers/nvfx | |
| parent | 10dbd029279dda1689410d8ef2bc5aba64dd5958 (diff) | |
nouveau: Add support for XvMC acceleration
Try to use the PMPEG where available
Signed-off-by: Maarten Lankhorst <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nvfx')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_context.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_context.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_context.c b/src/gallium/drivers/nvfx/nvfx_context.c index e2cdcf636f9..37425b1fc3c 100644 --- a/src/gallium/drivers/nvfx/nvfx_context.c +++ b/src/gallium/drivers/nvfx/nvfx_context.c @@ -90,9 +90,6 @@ nvfx_create(struct pipe_screen *pscreen, void *priv) nvfx->pipe.clear = nvfx_clear; nvfx->pipe.flush = nvfx_flush; - nvfx->pipe.create_video_decoder = vl_create_decoder; - nvfx->pipe.create_video_buffer = vl_video_buffer_create; - nvfx->is_nv4x = screen->is_nv4x; nvfx->use_nv4x = screen->use_nv4x; /* TODO: it seems that nv30 might have fixed function clipping usable with vertex programs @@ -126,6 +123,7 @@ nvfx_create(struct pipe_screen *pscreen, void *priv) nvfx->relocs_needed = NVFX_RELOCATE_ALL; LIST_INITHEAD(&nvfx->render_cache); + nvfx_context_init_vdec(nvfx); return &nvfx->pipe; } diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h index dad912b2aee..cb40a521d1b 100644 --- a/src/gallium/drivers/nvfx/nvfx_context.h +++ b/src/gallium/drivers/nvfx/nvfx_context.h @@ -340,6 +340,8 @@ extern void nvfx_init_vertprog_functions(struct nvfx_context *nvfx); /* nvfx_push.c */ extern void nvfx_push_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info); +extern void nvfx_context_init_vdec(struct nvfx_context *); + static inline void nvfx_emit_vtx_attr(struct nouveau_channel* chan, struct nouveau_grobj *eng3d, unsigned attrib, const float* v, unsigned ncomp) |