radeon: fix includes

And add required forward declarations.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4319>

diff --git a/src/gallium/drivers/radeon/radeon_uvd_enc.h b/src/gallium/drivers/radeon/radeon_uvd_enc.h
index 52e7ae3c0a98ef30ea34524ea3d01db60758a613..a0f18b68742ab56178cedcdd74898bfae6418720 100644 (file)
--- 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 bb2567ed3bee8039dd39228fb9398d1f51e4b901..8550cc26f17306c7b770a9f1b03ae58ae34fd9f0 100644 (file)
--- 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 f079b94dff5ee581466399c18de6c6568459bedd..7cd358a6129c60cd37178dfaa4a3afa834963060 100644 (file)
--- 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 8edc903f15edd96987fcac4dc2e2bdd01fa915d5..fcf440775584209ead99b960c5a65920486f9214 100644 (file)
--- 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