From c5fb2fff181c7c108848fdfb3aba00a56d2ae916 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 27 Jun 2023 15:24:08 +1000 Subject: [PATCH] ac,radeonsi: move vcn enc av1 default cdf file to common MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This can be used by radv. Acked-by: Marek Olšák Part-of: --- .../common/ac_vcn_enc_av1_default_cdf.h} | 4 ++-- src/gallium/drivers/radeonsi/meson.build | 1 - src/gallium/drivers/radeonsi/radeon_vcn_enc.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename src/{gallium/drivers/radeonsi/radeon_vcn_enc_av1_default_cdf.h => amd/common/ac_vcn_enc_av1_default_cdf.h} (99%) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_av1_default_cdf.h b/src/amd/common/ac_vcn_enc_av1_default_cdf.h similarity index 99% rename from src/gallium/drivers/radeonsi/radeon_vcn_enc_av1_default_cdf.h rename to src/amd/common/ac_vcn_enc_av1_default_cdf.h index 9c2f6fcea6b..d6d98d66e58 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_av1_default_cdf.h +++ b/src/amd/common/ac_vcn_enc_av1_default_cdf.h @@ -1,5 +1,5 @@ -#ifndef _RADEON_VCN_ENC_AV1_DEFAULT_CDF_H -#define _RADEON_VCN_ENC_AV1_DEFAULT_CDF_H +#ifndef _AC_VCN_ENC_AV1_DEFAULT_CDF_H +#define _AC_VCN_ENC_AV1_DEFAULT_CDF_H #define VCN_ENC_AV1_DEFAULT_CDF_SIZE (81920) diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build index 13aa594df05..bf4ea47c023 100644 --- a/src/gallium/drivers/radeonsi/meson.build +++ b/src/gallium/drivers/radeonsi/meson.build @@ -97,7 +97,6 @@ files_libradeonsi = files( 'radeon_vcn_enc_2_0.c', 'radeon_vcn_enc_3_0.c', 'radeon_vcn_enc_4_0.c', - 'radeon_vcn_enc_av1_default_cdf.h', 'radeon_video.c', 'radeon_video.h', ) diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c index 2e2448aa959..1e70cae8d5d 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c @@ -7,7 +7,7 @@ **************************************************************************/ #include "radeon_vcn_enc.h" -#include "radeon_vcn_enc_av1_default_cdf.h" +#include "ac_vcn_enc_av1_default_cdf.h" #include "pipe/p_video_codec.h" #include "radeon_video.h"