diff options
| author | Marek Olšák <[email protected]> | 2017-09-13 02:26:26 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-09-26 04:21:14 +0200 |
| commit | 06bfb2d28f7adca7edc6be9c210a7a3583023652 (patch) | |
| tree | a969d20fe1d2a75eb03facabe4c5fb83948178f0 /src/gallium/drivers/radeon/radeon_vce_50.c | |
| parent | e1623da8185ee5d167cd331fb645e6a83961285a (diff) | |
r600: fork and import gallium/radeon
This marks the end of code sharing between r600 and radeonsi.
It's getting difficult to work on radeonsi without breaking r600.
A lot of functions had to be renamed to prevent linker conflicts.
There are also minor cleanups.
Acked-by: Dave Airlie <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon/radeon_vce_50.c')
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_vce_50.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeon/radeon_vce_50.c b/src/gallium/drivers/radeon/radeon_vce_50.c index 0d11814515d..96bb557ebb2 100644 --- a/src/gallium/drivers/radeon/radeon_vce_50.c +++ b/src/gallium/drivers/radeon/radeon_vce_50.c @@ -173,8 +173,8 @@ static void encode(struct rvce_encoder *enc) RVCE_CS(0x00000000); // pictureStructure if(enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_P || enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_B) { - struct rvce_cpb_slot *l0 = l0_slot(enc); - rvce_frame_offset(enc, l0, &luma_offset, &chroma_offset); + struct rvce_cpb_slot *l0 = si_l0_slot(enc); + si_vce_frame_offset(enc, l0, &luma_offset, &chroma_offset); RVCE_CS(l0->picture_type); // encPicType RVCE_CS(l0->frame_num); // frameNumber RVCE_CS(l0->pic_order_cnt); // pictureOrderCount @@ -199,8 +199,8 @@ static void encode(struct rvce_encoder *enc) // encReferencePictureL1[0] RVCE_CS(0x00000000); // pictureStructure if(enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_B) { - struct rvce_cpb_slot *l1 = l1_slot(enc); - rvce_frame_offset(enc, l1, &luma_offset, &chroma_offset); + struct rvce_cpb_slot *l1 = si_l1_slot(enc); + si_vce_frame_offset(enc, l1, &luma_offset, &chroma_offset); RVCE_CS(l1->picture_type); // encPicType RVCE_CS(l1->frame_num); // frameNumber RVCE_CS(l1->pic_order_cnt); // pictureOrderCount @@ -214,7 +214,7 @@ static void encode(struct rvce_encoder *enc) RVCE_CS(0xffffffff); // chromaOffset } - rvce_frame_offset(enc, current_slot(enc), &luma_offset, &chroma_offset); + si_vce_frame_offset(enc, si_current_slot(enc), &luma_offset, &chroma_offset); RVCE_CS(luma_offset); // encReconstructedLumaOffset RVCE_CS(chroma_offset); // encReconstructedChromaOffset RVCE_CS(0x00000000); // encColocBufferOffset @@ -233,13 +233,13 @@ static void encode(struct rvce_encoder *enc) RVCE_END(); } -void radeon_vce_50_get_param(struct rvce_encoder *enc, struct pipe_h264_enc_picture_desc *pic) +void si_vce_50_get_param(struct rvce_encoder *enc, struct pipe_h264_enc_picture_desc *pic) { } -void radeon_vce_50_init(struct rvce_encoder *enc) +void si_vce_50_init(struct rvce_encoder *enc) { - radeon_vce_40_2_2_init(enc); + si_vce_40_2_2_init(enc); /* only the two below are different */ enc->rate_control = rate_control; |