diff options
author | Christian König <christian.koenig@amd.com> | 2014-02-11 11:55:47 +0100 |
---|---|---|
committer | Christian König <christian.koenig@amd.com> | 2014-02-13 09:46:54 +0100 |
commit | 1ef7b9de068cc8c17b148538e569ec8d3d601fdf (patch) | |
tree | 6f3895a4483cc10c2560e77e3a9d22c9bacec1f5 /src/gallium/drivers | |
parent | 18caef953f2de134077bfa6e46f8616f68ff1b1b (diff) |
gallium/vl: remove remaining softpipe video functions
Unused and unmaintained for quite a while.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/softpipe/sp_context.c | 5 | ||||
-rw-r--r-- | src/gallium/drivers/softpipe/sp_screen.c | 31 |
2 files changed, 0 insertions, 36 deletions
diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c index b4c85df9aa6..34d2b80f19b 100644 --- a/src/gallium/drivers/softpipe/sp_context.c +++ b/src/gallium/drivers/softpipe/sp_context.c @@ -38,8 +38,6 @@ #include "util/u_pstipple.h" #include "util/u_inlines.h" #include "tgsi/tgsi_exec.h" -#include "vl/vl_decoder.h" -#include "vl/vl_video_buffer.h" #include "sp_clear.h" #include "sp_context.h" #include "sp_flush.h" @@ -228,9 +226,6 @@ softpipe_create_context( struct pipe_screen *screen, softpipe->pipe.render_condition = softpipe_render_condition; - softpipe->pipe.create_video_codec = vl_create_decoder; - softpipe->pipe.create_video_buffer = vl_video_buffer_create; - /* * Alloc caches for accessing drawing surfaces and textures. * Must be before quad stage setup! diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 147196e6abe..46ac519db12 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -34,8 +34,6 @@ #include "pipe/p_defines.h" #include "pipe/p_screen.h" #include "draw/draw_context.h" -#include "vl/vl_decoder.h" -#include "vl/vl_video_buffer.h" #include "state_tracker/sw_winsys.h" #include "tgsi/tgsi_exec.h" @@ -250,33 +248,6 @@ softpipe_get_paramf(struct pipe_screen *screen, enum pipe_capf param) return 0.0; } -static int -softpipe_get_video_param(struct pipe_screen *screen, - enum pipe_video_profile profile, - enum pipe_video_entrypoint entrypoint, - enum pipe_video_cap param) -{ - switch (param) { - case PIPE_VIDEO_CAP_SUPPORTED: - return vl_profile_supported(screen, profile, entrypoint); - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 0; - case PIPE_VIDEO_CAP_MAX_WIDTH: - case PIPE_VIDEO_CAP_MAX_HEIGHT: - return vl_video_buffer_max_size(screen); - case PIPE_VIDEO_CAP_PREFERED_FORMAT: - return PIPE_FORMAT_NV12; - case PIPE_VIDEO_CAP_PREFERS_INTERLACED: - return false; - case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: - return false; - case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: - return true; - default: - return 0; - } -} - /** * Query format support for creating a texture, drawing surface, etc. * \param format the format to test @@ -408,10 +379,8 @@ softpipe_create_screen(struct sw_winsys *winsys) screen->base.get_param = softpipe_get_param; screen->base.get_shader_param = softpipe_get_shader_param; screen->base.get_paramf = softpipe_get_paramf; - screen->base.get_video_param = softpipe_get_video_param; screen->base.get_timestamp = softpipe_get_timestamp; screen->base.is_format_supported = softpipe_is_format_supported; - screen->base.is_video_format_supported = vl_video_buffer_is_format_supported; screen->base.context_create = softpipe_create_context; screen->base.flush_frontbuffer = softpipe_flush_frontbuffer; |