diff --git a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp index b2833ab5cd0..c9bb5fb65b6 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp @@ -2245,8 +2245,6 @@ d3d12_screen_get_video_param_decode(struct pipe_screen *pscreen, flush internally on end frame for decode */ return 0; - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: case PIPE_VIDEO_CAP_MAX_LEVEL: @@ -2316,8 +2314,6 @@ d3d12_screen_get_video_param_postproc(struct pipe_screen *pscreen, switch (param) { case PIPE_VIDEO_CAP_REQUIRES_FLUSH_ON_END_FRAME: return 1; - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: case PIPE_VIDEO_CAP_MIN_WIDTH: @@ -2461,8 +2457,6 @@ d3d12_screen_get_video_param_encode(struct pipe_screen *pscreen, switch (param) { case PIPE_VIDEO_CAP_REQUIRES_FLUSH_ON_END_FRAME: return 1; - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MAX_TEMPORAL_LAYERS: { switch (u_reduce_video_profile(profile)) { diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index 17aa7e14d60..d2666fb6a0f 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -832,8 +832,6 @@ nouveau_screen_get_video_param(struct pipe_screen *pscreen, case PIPE_VIDEO_CAP_SUPPORTED: return entrypoint >= PIPE_VIDEO_ENTRYPOINT_IDCT && u_reduce_video_profile(profile) == PIPE_VIDEO_FORMAT_MPEG12; - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: return vl_video_buffer_max_size(pscreen); diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c b/src/gallium/drivers/nouveau/nouveau_vp3_video.c index 30bb60ea1f7..15cabea9da9 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c @@ -451,8 +451,6 @@ nouveau_vp3_screen_get_video_param(struct pipe_screen *pscreen, profile >= PIPE_VIDEO_PROFILE_MPEG1 && profile < PIPE_VIDEO_PROFILE_HEVC_MAIN && firmware_present(pscreen, profile); - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MAX_WIDTH: switch (codec) { case PIPE_VIDEO_FORMAT_MPEG12: diff --git a/src/gallium/drivers/nouveau/nv50/nv84_video.c b/src/gallium/drivers/nouveau/nv50/nv84_video.c index 11a968cbde5..294c19ed967 100644 --- a/src/gallium/drivers/nouveau/nv50/nv84_video.c +++ b/src/gallium/drivers/nouveau/nv50/nv84_video.c @@ -821,8 +821,6 @@ nv84_screen_get_video_param(struct pipe_screen *pscreen, return (codec == PIPE_VIDEO_FORMAT_MPEG4_AVC || codec == PIPE_VIDEO_FORMAT_MPEG12) && firmware_present(pscreen, codec); - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MAX_WIDTH: case PIPE_VIDEO_CAP_MAX_HEIGHT: return 2048; diff --git a/src/gallium/drivers/r600/radeon_video.c b/src/gallium/drivers/r600/radeon_video.c index 60313478bf1..91c80412cd9 100644 --- a/src/gallium/drivers/r600/radeon_video.c +++ b/src/gallium/drivers/r600/radeon_video.c @@ -204,8 +204,6 @@ int rvid_get_video_param(struct pipe_screen *screen, case PIPE_VIDEO_CAP_SUPPORTED: return codec == PIPE_VIDEO_FORMAT_MPEG4_AVC && rvce_is_fw_version_supported(rscreen); - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MAX_WIDTH: return 2048; case PIPE_VIDEO_CAP_MAX_HEIGHT: @@ -237,8 +235,6 @@ int rvid_get_video_param(struct pipe_screen *screen, default: return false; } - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MAX_WIDTH: return 2048; case PIPE_VIDEO_CAP_MAX_HEIGHT: diff --git a/src/gallium/drivers/radeonsi/mm/si_mm_screen.c b/src/gallium/drivers/radeonsi/mm/si_mm_screen.c index cfadf6e58bf..b979af77fc3 100644 --- a/src/gallium/drivers/radeonsi/mm/si_mm_screen.c +++ b/src/gallium/drivers/radeonsi/mm/si_mm_screen.c @@ -122,8 +122,6 @@ static int si_video_get_param(struct pipe_screen *screen, enum pipe_video_profil (profile == PIPE_VIDEO_PROFILE_HEVC_MAIN_10 && sscreen->info.vcn_ip_version >= VCN_2_0_0) || (profile == PIPE_VIDEO_PROFILE_AV1_MAIN && (sscreen->info.vcn_ip_version >= VCN_4_0_0 && sscreen->info.vcn_ip_version != VCN_4_0_3)))); - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MIN_WIDTH: if (sscreen->info.vcn_ip_version >= VCN_5_0_0) { if (codec == PIPE_VIDEO_FORMAT_MPEG4_AVC) @@ -408,8 +406,6 @@ static int si_video_get_param(struct pipe_screen *screen, enum pipe_video_profil default: return false; } - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return 1; case PIPE_VIDEO_CAP_MIN_WIDTH: case PIPE_VIDEO_CAP_MIN_HEIGHT: if (codec == PIPE_VIDEO_FORMAT_VP9 || codec == PIPE_VIDEO_FORMAT_AV1) diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index dc9d9d673e6..89d89027eb2 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -126,20 +126,18 @@ virgl_get_video_param(struct pipe_screen *screen, /* * Since there are calls like this: - * pot_buffers = !pipe->screen->get_video_param + * pipe->screen->get_video_param * ( * pipe->screen, * PIPE_VIDEO_PROFILE_UNKNOWN, * PIPE_VIDEO_ENTRYPOINT_UNKNOWN, - * PIPE_VIDEO_CAP_NPOT_TEXTURES + * PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE * ); * All parameters need to check the vcaps. */ switch (param) { case PIPE_VIDEO_CAP_SUPPORTED: return vcaps != NULL; - case PIPE_VIDEO_CAP_NPOT_TEXTURES: - return vcaps ? vcaps->npot_texture : true; case PIPE_VIDEO_CAP_MAX_WIDTH: return vcaps ? vcaps->max_width : 0; case PIPE_VIDEO_CAP_MAX_HEIGHT: diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index e59b1cefdd2..c21a1e6266a 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -81,7 +81,6 @@ enum pipe_video_profile enum pipe_video_cap { PIPE_VIDEO_CAP_SUPPORTED = 0, - PIPE_VIDEO_CAP_NPOT_TEXTURES = 1, PIPE_VIDEO_CAP_MAX_WIDTH = 2, PIPE_VIDEO_CAP_MAX_HEIGHT = 3, PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE = 6,