From 7d78016cabdb67547bca46768734d4775b0c0d7f Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 5 Mar 2025 09:35:52 +0100 Subject: [PATCH] r300: Remove mpeg12 shader decoder support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Pavel Ondračka Part-of: --- src/gallium/drivers/r300/r300_context.c | 4 ---- src/gallium/drivers/r300/r300_screen.c | 27 ------------------------- 2 files changed, 31 deletions(-) diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c index d87286d4267..1382cf09529 100644 --- a/src/gallium/drivers/r300/r300_context.c +++ b/src/gallium/drivers/r300/r300_context.c @@ -10,7 +10,6 @@ #include "util/u_upload_mgr.h" #include "util/u_debug_cb.h" #include "util/os_time.h" -#include "vl/vl_decoder.h" #include "vl/vl_video_buffer.h" #include "r300_cb.h" @@ -416,9 +415,6 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen, r300_init_render_functions(r300); r300_init_states(&r300->context); - r300->context.create_video_codec = vl_create_decoder; - r300->context.create_video_buffer = vl_video_buffer_create; - r300->uploader = u_upload_create(&r300->context, 128 * 1024, PIPE_BIND_CUSTOM, PIPE_USAGE_STREAM, 0); r300->context.stream_uploader = u_upload_create(&r300->context, 1024 * 1024, diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 93d69ab5b82..0dbc4d30964 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -12,7 +12,6 @@ #include "util/hex.h" #include "util/os_time.h" #include "util/xmlconfig.h" -#include "vl/vl_decoder.h" #include "vl/vl_video_buffer.h" #include "r300_context.h" @@ -104,30 +103,6 @@ static struct disk_cache* r300_get_disk_shader_cache(struct pipe_screen* pscreen return r300screen->disk_shader_cache; } -static int r300_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_PREFERRED_FORMAT: - return PIPE_FORMAT_NV12; - case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: - return true; - case PIPE_VIDEO_CAP_MAX_LEVEL: - return vl_level_supported(screen, profile); - default: - return 0; - } -} - #define COMMON_NIR_OPTIONS \ .fdot_replicates = true, \ .fuse_ffma32 = true, \ @@ -710,9 +685,7 @@ struct pipe_screen* r300_screen_create(struct radeon_winsys *rws, r300screen->screen.get_device_vendor = r300_get_device_vendor; r300screen->screen.get_disk_shader_cache = r300_get_disk_shader_cache; r300screen->screen.get_screen_fd = r300_screen_get_fd; - r300screen->screen.get_video_param = r300_get_video_param; r300screen->screen.is_format_supported = r300_is_format_supported; - r300screen->screen.is_video_format_supported = vl_video_buffer_is_format_supported; r300screen->screen.context_create = r300_create_context; r300screen->screen.fence_reference = r300_fence_reference; r300screen->screen.fence_finish = r300_fence_finish;