From ea78480029450c019287c2a94d7c42a6a1d12dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Fri, 8 Jul 2011 19:22:43 +0200 Subject: [g3dvl] and finally remove pipe_video_context --- src/gallium/drivers/r600/r600_pipe.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/gallium/drivers/r600') diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index d8b51ea..76bb188 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -38,7 +38,7 @@ #include #include #include "util/u_upload_mgr.h" -#include +#include #include #include "os/os_time.h" #include @@ -226,6 +226,8 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void r600_init_context_resource_functions(rctx); r600_init_surface_functions(rctx); rctx->context.draw_vbo = r600_draw_vbo; + + rctx->context.create_video_decoder = vl_create_decoder; rctx->context.create_video_buffer = vl_video_buffer_create; switch (r600_get_family(rctx->radeon)) { @@ -302,14 +304,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void return &rctx->context; } -static struct pipe_video_context * -r600_video_create(struct pipe_screen *screen, struct pipe_context *pipe) -{ - assert(screen && pipe); - - return vl_create_context(pipe); -} - /* * pipe_screen */ @@ -679,7 +673,6 @@ struct pipe_screen *r600_screen_create(struct radeon *radeon) rscreen->screen.is_format_supported = r600_is_format_supported; rscreen->screen.is_video_format_supported = vl_video_buffer_is_format_supported; rscreen->screen.context_create = r600_create_context; - rscreen->screen.video_context_create = r600_video_create; rscreen->screen.fence_reference = r600_fence_reference; rscreen->screen.fence_signalled = r600_fence_signalled; rscreen->screen.fence_finish = r600_fence_finish; -- cgit v1.1