Module: Mesa Branch: main Commit: 25d0384df8b7b7bfcce35eccdfd9346220b93c96 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25d0384df8b7b7bfcce35eccdfd9346220b93c96
Author: Shih, Jude <jude.s...@amd.com> Date: Wed Dec 13 09:43:47 2023 +0800 amd/vpelib: Add VPE prefix on API to avoid naming conflict We need to add vpe prefix on some API such as convert_to_tetrahedral to avoid naming conflict. Reviewed-by: Roy Chan <roy.c...@amd.com> Acked-by: Alan Liu <haoping....@amd.com> Signed-off-by: Jude Shih <shens...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26841> --- src/amd/vpelib/src/core/3dlut_builder.c | 2 +- src/amd/vpelib/src/core/color.c | 2 +- src/amd/vpelib/src/core/inc/3dlut_builder.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vpelib/src/core/3dlut_builder.c b/src/amd/vpelib/src/core/3dlut_builder.c index 81b5a212b5f..dc53c98afeb 100644 --- a/src/amd/vpelib/src/core/3dlut_builder.c +++ b/src/amd/vpelib/src/core/3dlut_builder.c @@ -74,7 +74,7 @@ static void convert_3dlut_to_tetrahedral_params( params->use_tetrahedral_9 = !is_17x17x17; } -bool convert_to_tetrahedral(struct vpe_priv *vpe_priv, uint16_t rgb_lib[17 * 17 * 17 * 3], +bool vpe_convert_to_tetrahedral(struct vpe_priv *vpe_priv, uint16_t rgb_lib[17 * 17 * 17 * 3], struct vpe_3dlut *params, bool enable_3dlut) { diff --git a/src/amd/vpelib/src/core/color.c b/src/amd/vpelib/src/core/color.c index 2725221382e..5983827a28d 100644 --- a/src/amd/vpelib/src/core/color.c +++ b/src/amd/vpelib/src/core/color.c @@ -842,7 +842,7 @@ enum vpe_status vpe_color_update_movable_cm( vpe_color_update_gamut(vpe_priv, out_lut_cs, vpe_priv->output_ctx.cs, output_ctx->gamut_remap, !enable_3dlut); - convert_to_tetrahedral(vpe_priv, param->streams[stream_idx].tm_params.lut_data, + vpe_convert_to_tetrahedral(vpe_priv, param->streams[stream_idx].tm_params.lut_data, stream_ctx->lut3d_func, enable_3dlut); stream_ctx->update_3dlut = false; diff --git a/src/amd/vpelib/src/core/inc/3dlut_builder.h b/src/amd/vpelib/src/core/inc/3dlut_builder.h index 07cb626ffe7..e82814fa22d 100644 --- a/src/amd/vpelib/src/core/inc/3dlut_builder.h +++ b/src/amd/vpelib/src/core/inc/3dlut_builder.h @@ -30,5 +30,5 @@ #define LUT3D_SIZE_17x17x17 4913 #define LUT3D_SIZE_9x9x9 729 -bool convert_to_tetrahedral(struct vpe_priv *vpe_priv, uint16_t rgb[17 * 17 * 17 * 3], +bool vpe_convert_to_tetrahedral(struct vpe_priv *vpe_priv, uint16_t rgb[17 * 17 * 17 * 3], struct vpe_3dlut *params, bool enable_3dlut);
