diff --git a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp index f11f1fceb22..a2a5454cbab 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp @@ -2312,10 +2312,6 @@ d3d12_screen_get_video_param_decode(struct pipe_screen *pscreen, } break; case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return (profile == PIPE_VIDEO_PROFILE_UNKNOWN) ? PIPE_FORMAT_NV12 : d3d12_get_pipe_format(d3d12_convert_pipe_video_profile_to_dxgi_format(profile)); - case PIPE_VIDEO_CAP_PREFERS_INTERLACED: - return false; - case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: - return true; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return true; case PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP: @@ -2343,7 +2339,6 @@ d3d12_screen_get_video_param_postproc(struct pipe_screen *pscreen, case PIPE_VIDEO_CAP_MIN_HEIGHT: case PIPE_VIDEO_CAP_SUPPORTED: case PIPE_VIDEO_CAP_PREFERRED_FORMAT: - case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: case PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP: case PIPE_VIDEO_CAP_VPP_MAX_INPUT_WIDTH: @@ -2386,8 +2381,6 @@ d3d12_screen_get_video_param_postproc(struct pipe_screen *pscreen, return true; } else if (param == PIPE_VIDEO_CAP_PREFERRED_FORMAT) { return PIPE_FORMAT_NV12; - } else if (param == PIPE_VIDEO_CAP_SUPPORTS_INTERLACED) { - return false; } else if (param == PIPE_VIDEO_CAP_MIN_WIDTH) { return minSupportedInput.Width; } else if (param == PIPE_VIDEO_CAP_MIN_HEIGHT) { @@ -2699,10 +2692,6 @@ d3d12_screen_get_video_param_encode(struct pipe_screen *pscreen, } break; case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return (profile == PIPE_VIDEO_PROFILE_UNKNOWN) ? PIPE_FORMAT_NV12 : d3d12_get_pipe_format(d3d12_convert_pipe_video_profile_to_dxgi_format(profile)); - case PIPE_VIDEO_CAP_PREFERS_INTERLACED: - return false; - case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: - return false; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return true; case PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP: diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index 7106e5f4bc1..d2aa7bfdcb0 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -844,10 +844,6 @@ nouveau_screen_get_video_param(struct pipe_screen *pscreen, return vl_video_buffer_max_size(pscreen); case PIPE_VIDEO_CAP_PREFERRED_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; case PIPE_VIDEO_CAP_MAX_LEVEL: diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c b/src/gallium/drivers/nouveau/nouveau_vp3_video.c index 1e6381b32fb..78a8e21a912 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c @@ -506,9 +506,6 @@ nouveau_vp3_screen_get_video_param(struct pipe_screen *pscreen, } case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; - case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: - case PIPE_VIDEO_CAP_PREFERS_INTERLACED: - return true; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return false; case PIPE_VIDEO_CAP_MAX_LEVEL: diff --git a/src/gallium/drivers/nouveau/nv50/nv84_video.c b/src/gallium/drivers/nouveau/nv50/nv84_video.c index ee51ce7ac0d..f873bcf280b 100644 --- a/src/gallium/drivers/nouveau/nv50/nv84_video.c +++ b/src/gallium/drivers/nouveau/nv50/nv84_video.c @@ -828,9 +828,6 @@ nv84_screen_get_video_param(struct pipe_screen *pscreen, return 2048; case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; - case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: - case PIPE_VIDEO_CAP_PREFERS_INTERLACED: - return true; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return false; case PIPE_VIDEO_CAP_MAX_LEVEL: diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index d8bb2a66f4a..4cde87264ce 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -120,10 +120,6 @@ static int r300_get_video_param(struct pipe_screen *screen, return vl_video_buffer_max_size(screen); case PIPE_VIDEO_CAP_PREFERRED_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; case PIPE_VIDEO_CAP_MAX_LEVEL: diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c index a398cacac3e..c1c51f755b6 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.c +++ b/src/gallium/drivers/r600/r600_pipe_common.c @@ -801,10 +801,6 @@ static int r600_get_video_param(struct pipe_screen *screen, return vl_video_buffer_max_size(screen); case PIPE_VIDEO_CAP_PREFERRED_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; case PIPE_VIDEO_CAP_MAX_LEVEL: diff --git a/src/gallium/drivers/r600/radeon_video.c b/src/gallium/drivers/r600/radeon_video.c index e083cb3c725..636200ac175 100644 --- a/src/gallium/drivers/r600/radeon_video.c +++ b/src/gallium/drivers/r600/radeon_video.c @@ -212,10 +212,6 @@ int rvid_get_video_param(struct pipe_screen *screen, return 1152; case PIPE_VIDEO_CAP_PREFERRED_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; case PIPE_VIDEO_CAP_STACKED_FRAMES: @@ -253,20 +249,6 @@ int rvid_get_video_param(struct pipe_screen *screen, case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return PIPE_FORMAT_NV12; - case PIPE_VIDEO_CAP_PREFERS_INTERLACED: - case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: - if (rscreen->family < CHIP_PALM) { - /* MPEG2 only with shaders and no support for - interlacing on R6xx style UVD */ - return codec != PIPE_VIDEO_FORMAT_MPEG12 && - rscreen->family > CHIP_RV770; - } else { - enum pipe_video_format format = u_reduce_video_profile(profile); - - if (format == PIPE_VIDEO_FORMAT_JPEG) - return false; - return true; - } case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return true; case PIPE_VIDEO_CAP_MAX_LEVEL: diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index ef8dc097365..32dddb54554 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -147,10 +147,6 @@ virgl_get_video_param(struct pipe_screen *screen, return vcaps ? vcaps->max_height : 0; case PIPE_VIDEO_CAP_PREFERRED_FORMAT: return vcaps ? virgl_to_pipe_format(vcaps->prefered_format) : PIPE_FORMAT_NV12; - case PIPE_VIDEO_CAP_PREFERS_INTERLACED: - return vcaps ? vcaps->prefers_interlaced : false; - case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: - return vcaps ? vcaps->supports_interlaced : false; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return vcaps ? vcaps->supports_progressive : true; case PIPE_VIDEO_CAP_MAX_LEVEL: diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index 39c0bcef08a..dc9f3a1fb98 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -88,9 +88,7 @@ enum pipe_video_cap PIPE_VIDEO_CAP_MAX_WIDTH = 2, PIPE_VIDEO_CAP_MAX_HEIGHT = 3, PIPE_VIDEO_CAP_PREFERRED_FORMAT = 4, - PIPE_VIDEO_CAP_PREFERS_INTERLACED = 5, PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE = 6, - PIPE_VIDEO_CAP_SUPPORTS_INTERLACED = 7, PIPE_VIDEO_CAP_MAX_LEVEL = 8, PIPE_VIDEO_CAP_STACKED_FRAMES = 9, PIPE_VIDEO_CAP_MAX_MACROBLOCKS = 10,