From 15540abf2241590a5cc38721ef41d76fd0a9b34a Mon Sep 17 00:00:00 2001 From: Sil Vilerino Date: Mon, 2 May 2022 15:22:50 -0700 Subject: [PATCH] gallium/va/radeonsi: Using private as a parameter name conflicts with C++ keywords Reviewed-by: Leo Liu Acked-by: Jesse Natalie Part-of: --- src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 2 +- src/gallium/frontends/va/picture_h264.c | 4 ++-- src/gallium/include/pipe/p_video_state.h | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c index cd4158f4d7b..f5f0771f890 100755 --- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c @@ -166,7 +166,7 @@ static rvcn_dec_message_avc_t get_h264_msg(struct radeon_decoder *dec, goto end; } - private = pic->private; + private = pic->priv; for (i = 0; i < ARRAY_SIZE(private->past_ref); i++) { for (k = 0; private->past_ref[i] && (k < ARRAY_SIZE(pic->ref)); k++) if (pic->ref[k] && (private->past_ref[i] == pic->ref[k])) diff --git a/src/gallium/frontends/va/picture_h264.c b/src/gallium/frontends/va/picture_h264.c index 9e44a3387e5..3a84926083c 100755 --- a/src/gallium/frontends/va/picture_h264.c +++ b/src/gallium/frontends/va/picture_h264.c @@ -45,7 +45,7 @@ static void vlVaGetPastReferenceFrame(vlVaDriver *drv, VASurfaceID surface_id, static void resetReferencePictureDesc(struct pipe_h264_picture_desc *h264, unsigned int i) { - struct h264_private *private = h264->private; + struct h264_private *private = h264->priv; h264->ref[i] = NULL; h264->frame_num_list[i] = 0; @@ -68,7 +68,7 @@ void vlVaHandlePictureParameterBufferH264(vlVaDriver *drv, vlVaContext *context, assert(buf->size >= sizeof(VAPictureParameterBufferH264) && buf->num_elements == 1); context->desc.h264.slice_count = 0; - context->desc.h264.private = private; + context->desc.h264.priv = private; /*CurrPic*/ context->desc.h264.field_order_cnt[0] = h264->CurrPic.TopFieldOrderCnt; context->desc.h264.field_order_cnt[1] = h264->CurrPic.BottomFieldOrderCnt; diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h index 428e78b8b10..b029ee7f510 100755 --- a/src/gallium/include/pipe/p_video_state.h +++ b/src/gallium/include/pipe/p_video_state.h @@ -353,7 +353,9 @@ struct pipe_h264_picture_desc uint32_t frame_num_list[16]; struct pipe_video_buffer *ref[16]; - void *private; + + /* using private as a parameter name conflicts with C++ keywords */ + void *priv; }; struct pipe_h264_enc_rate_control