Module: Mesa Branch: master Commit: b7f975980916d670dcfc280af1678f4439a59d2f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7f975980916d670dcfc280af1678f4439a59d2f
Author: Timur Kristóf <[email protected]> Date: Tue Jan 21 16:04:33 2020 +0100 radeon: Move si_get_pic_param to radeon_vce.c Signed-off-by: Timur Kristóf <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488> --- src/gallium/drivers/radeon/radeon_vce.c | 4 ++++ src/gallium/drivers/radeon/radeon_vce.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c index 84d3c1e2fa4..652b4250654 100644 --- a/src/gallium/drivers/radeon/radeon_vce.c +++ b/src/gallium/drivers/radeon/radeon_vce.c @@ -48,6 +48,10 @@ #define FW_52_8_3 ((52 << 24) | (8 << 16) | (3 << 8)) #define FW_53 (53 << 24) +/* version specific function for getting parameters */ +static void (*si_get_pic_param)(struct rvce_encoder *enc, + struct pipe_h264_enc_picture_desc *pic) = NULL; + /** * flush commands to the hardware */ diff --git a/src/gallium/drivers/radeon/radeon_vce.h b/src/gallium/drivers/radeon/radeon_vce.h index cf625e6fed7..b5cfe178061 100644 --- a/src/gallium/drivers/radeon/radeon_vce.h +++ b/src/gallium/drivers/radeon/radeon_vce.h @@ -437,10 +437,6 @@ void si_vce_50_init(struct rvce_encoder *enc); /* init vce fw 52 specific callbacks */ void si_vce_52_init(struct rvce_encoder *enc); -/* version specific function for getting parameters */ -void (*si_get_pic_param)(struct rvce_encoder *enc, - struct pipe_h264_enc_picture_desc *pic); - /* get parameters for vce 40.2.2 */ void si_vce_40_2_2_get_param(struct rvce_encoder *enc, struct pipe_h264_enc_picture_desc *pic); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
