Module: Mesa Branch: master Commit: 53e5e802f88134492e4c88936f2d7a961cd431a5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=53e5e802f88134492e4c88936f2d7a961cd431a5
Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Fri Mar 27 20:33:13 2020 +0100 radeon: fix includes And add required forward declarations. Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4319> --- src/gallium/drivers/radeon/radeon_uvd_enc.h | 4 ++++ src/gallium/drivers/radeon/radeon_vce.h | 1 + src/gallium/drivers/radeon/radeon_vcn_dec.h | 2 ++ src/gallium/drivers/radeon/radeon_vcn_enc.h | 2 ++ 4 files changed, 9 insertions(+) diff --git a/src/gallium/drivers/radeon/radeon_uvd_enc.h b/src/gallium/drivers/radeon/radeon_uvd_enc.h index 52e7ae3c0a9..a0f18b68742 100644 --- a/src/gallium/drivers/radeon/radeon_uvd_enc.h +++ b/src/gallium/drivers/radeon/radeon_uvd_enc.h @@ -28,6 +28,8 @@ #ifndef _RADEON_UVD_ENC_H #define _RADEON_UVD_ENC_H +#include "radeon_video.h" + #define RENC_UVD_FW_INTERFACE_MAJOR_VERSION 1 #define RENC_UVD_FW_INTERFACE_MINOR_VERSION 1 @@ -463,6 +465,8 @@ struct radeon_uvd_encoder bool need_feedback; }; +struct si_screen; + void radeon_uvd_enc_1_1_init(struct radeon_uvd_encoder *enc); bool si_radeon_uvd_enc_supported(struct si_screen *sscreen); diff --git a/src/gallium/drivers/radeon/radeon_vce.h b/src/gallium/drivers/radeon/radeon_vce.h index bb2567ed3be..8550cc26f17 100644 --- a/src/gallium/drivers/radeon/radeon_vce.h +++ b/src/gallium/drivers/radeon/radeon_vce.h @@ -29,6 +29,7 @@ #define RADEON_VCE_H #include "util/list.h" +#include "radeon_video.h" #define RVCE_CS(value) (enc->cs->current.buf[enc->cs->current.cdw++] = (value)) #define RVCE_BEGIN(cmd) { \ diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.h b/src/gallium/drivers/radeon/radeon_vcn_dec.h index f079b94dff5..7cd358a6129 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_dec.h +++ b/src/gallium/drivers/radeon/radeon_vcn_dec.h @@ -28,6 +28,8 @@ #ifndef _RADEON_VCN_DEC_H #define _RADEON_VCN_DEC_H +#include "radeon_video.h" + #define RDECODE_PKT_TYPE_S(x) (((unsigned)(x) & 0x3) << 30) #define RDECODE_PKT_TYPE_G(x) (((x) >> 30) & 0x3) #define RDECODE_PKT_TYPE_C 0x3FFFFFFF diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.h b/src/gallium/drivers/radeon/radeon_vcn_enc.h index 8edc903f15e..fcf44077558 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc.h +++ b/src/gallium/drivers/radeon/radeon_vcn_enc.h @@ -28,6 +28,8 @@ #ifndef _RADEON_VCN_ENC_H #define _RADEON_VCN_ENC_H +#include "radeon_video.h" + #define RENCODE_IB_OP_INITIALIZE 0x01000001 #define RENCODE_IB_OP_CLOSE_SESSION 0x01000002 #define RENCODE_IB_OP_ENCODE 0x01000003 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
