diff --git a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp index eb649823ba0..eb74bbae1c0 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_screen.cpp @@ -535,7 +535,7 @@ d3d12_screen_get_video_param_decode(struct pipe_screen *pscreen, return true; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return true; - case PIPE_VIDEO_SUPPORTS_CONTIGUOUS_PLANES_MAP: + case PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP: return true; break; default: @@ -610,7 +610,7 @@ d3d12_screen_get_video_param_postproc(struct pipe_screen *pscreen, case PIPE_VIDEO_CAP_PREFERED_FORMAT: case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED: case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: - case PIPE_VIDEO_SUPPORTS_CONTIGUOUS_PLANES_MAP: + case PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP: case PIPE_VIDEO_CAP_VPP_MAX_INPUT_WIDTH: case PIPE_VIDEO_CAP_VPP_MAX_INPUT_HEIGHT: case PIPE_VIDEO_CAP_VPP_MIN_INPUT_WIDTH: @@ -655,7 +655,7 @@ d3d12_screen_get_video_param_postproc(struct pipe_screen *pscreen, return supportCaps.InputSample.Width; } else if (param == PIPE_VIDEO_CAP_MAX_HEIGHT) { return supportCaps.InputSample.Height; - } else if (param == PIPE_VIDEO_SUPPORTS_CONTIGUOUS_PLANES_MAP) { + } else if (param == PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP) { return true; } else if (param == PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE) { return true; @@ -760,7 +760,7 @@ d3d12_screen_get_video_param_encode(struct pipe_screen *pscreen, return false; case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE: return true; - case PIPE_VIDEO_SUPPORTS_CONTIGUOUS_PLANES_MAP: + case PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP: return true; default: debug_printf("[d3d12_screen_get_video_param] unknown video param: %d\n", param); diff --git a/src/gallium/frontends/va/image.c b/src/gallium/frontends/va/image.c index 0255cf59ced..76ecbedfba3 100644 --- a/src/gallium/frontends/va/image.c +++ b/src/gallium/frontends/va/image.c @@ -258,7 +258,7 @@ vlVaDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image) } else { if(!screen->get_video_param(screen, PIPE_VIDEO_PROFILE_UNKNOWN, PIPE_VIDEO_ENTRYPOINT_BITSTREAM, - PIPE_VIDEO_SUPPORTS_CONTIGUOUS_PLANES_MAP)) + PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP)) for (i = 0; i < ARRAY_SIZE(derive_progressive_disallowlist); i++) if ((strcmp(derive_progressive_disallowlist[i], proc) == 0)) return VA_STATUS_ERROR_OPERATION_FAILED; diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h index 2cf3ef08def..b3e4cd37f1e 100644 --- a/src/gallium/include/pipe/p_video_enums.h +++ b/src/gallium/include/pipe/p_video_enums.h @@ -109,7 +109,7 @@ enum pipe_video_cap /* If true, when mapping planar textures like NV12 or P016 the mapped buffer contains all the planes contiguously. This allows for use with some frontends functions that require this like vaDeriveImage */ - PIPE_VIDEO_SUPPORTS_CONTIGUOUS_PLANES_MAP = 27, + PIPE_VIDEO_CAP_SUPPORTS_CONTIGUOUS_PLANES_MAP = 27, PIPE_VIDEO_CAP_ENC_SUPPORTS_MAX_FRAME_SIZE = 28, PIPE_VIDEO_CAP_ENC_HEVC_BLOCK_SIZES = 29, PIPE_VIDEO_CAP_ENC_HEVC_FEATURE_FLAGS = 30,