From f265a194263bb2a3fa204947a9c98f472835f121 Mon Sep 17 00:00:00 2001 From: Christian König Date: Thu, 7 Jul 2011 22:51:45 +0200 Subject: [g3dvl] rename get_param to get_video_param and move into screen object --- src/gallium/include/pipe/p_defines.h | 5 +++++ src/gallium/include/pipe/p_screen.h | 6 ++++++ src/gallium/include/pipe/p_video_context.h | 6 ------ 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/gallium/include') diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 6c6641588d3..d8b1a9e171f 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -493,6 +493,11 @@ enum pipe_shader_cap PIPE_SHADER_CAP_SUBROUTINES = 16, /* BGNSUB, ENDSUB, CAL, RET */ }; +/* Video caps, can be different for each codec/profile */ +enum pipe_video_cap +{ + PIPE_VIDEO_CAP_NPOT_TEXTURES = 0, +}; enum pipe_video_codec { diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index 4f95fa1b2e1..2fa469bbea7 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -92,6 +92,12 @@ struct pipe_screen { */ int (*get_shader_param)( struct pipe_screen *, unsigned shader, enum pipe_shader_cap param ); + /** + * Query an integer-valued capability/parameter/limit for a codec/profile + * \param param one of PIPE_VIDEO_CAP_x + */ + int (*get_video_param)( struct pipe_screen *, enum pipe_video_profile profile, enum pipe_video_cap param ); + struct pipe_context * (*context_create)( struct pipe_screen *, void *priv ); struct pipe_video_context * (*video_context_create)( struct pipe_screen *screen, void *priv ); diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_context.h index c9e618b6080..1fb635f1756 100644 --- a/src/gallium/include/pipe/p_video_context.h +++ b/src/gallium/include/pipe/p_video_context.h @@ -55,12 +55,6 @@ struct pipe_video_context */ void (*destroy)(struct pipe_video_context *context); - /** - * Query an integer-valued capability/parameter/limit - * \param param one of PIPE_CAP_x - */ - int (*get_param)(struct pipe_video_context *context, int param); - /** * Check if the given pipe_format is supported as a video buffer */ -- cgit v1.2.3