From 139f55071bca6f868f41c4490debe7d16b585d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 12 Apr 2022 18:30:46 -0400 Subject: [PATCH] gallium: move drivers/radeon/* into drivers/radeonsi/ this is only used by radeonsi Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Mihai Preda Part-of: --- .gitlab-ci/test-source-dep.yml | 1 - .../auxiliary/target-helpers/drm_helper.h | 4 +- src/gallium/drivers/r300/r300_chipset.c | 2 +- src/gallium/drivers/r300/r300_screen.h | 2 +- src/gallium/drivers/r600/r600_pipe_common.h | 2 +- src/gallium/drivers/r600/radeon_uvd.h | 2 +- src/gallium/drivers/r600/radeon_video.h | 2 +- src/gallium/drivers/radeon/.dir-locals.el | 11 ----- src/gallium/drivers/radeonsi/meson.build | 47 ++++++++++--------- .../{radeon => radeonsi}/pspdecryptionparam.h | 0 .../drivers/{radeon => radeonsi}/radeon_efc.h | 0 .../{radeon => radeonsi}/radeon_temporal.h | 0 .../drivers/{radeon => radeonsi}/radeon_uvd.c | 0 .../drivers/{radeon => radeonsi}/radeon_uvd.h | 2 +- .../{radeon => radeonsi}/radeon_uvd_enc.c | 0 .../{radeon => radeonsi}/radeon_uvd_enc.h | 0 .../{radeon => radeonsi}/radeon_uvd_enc_1_1.c | 0 .../drivers/{radeon => radeonsi}/radeon_vce.c | 0 .../drivers/{radeon => radeonsi}/radeon_vce.h | 0 .../{radeon => radeonsi}/radeon_vce_40_2_2.c | 0 .../{radeon => radeonsi}/radeon_vce_50.c | 0 .../{radeon => radeonsi}/radeon_vce_52.c | 0 .../radeon_vcn_av1_default.h | 0 .../{radeon => radeonsi}/radeon_vcn_dec.c | 0 .../{radeon => radeonsi}/radeon_vcn_dec.h | 0 .../radeon_vcn_dec_jpeg.c | 0 .../{radeon => radeonsi}/radeon_vcn_enc.c | 0 .../{radeon => radeonsi}/radeon_vcn_enc.h | 0 .../{radeon => radeonsi}/radeon_vcn_enc_1_2.c | 0 .../{radeon => radeonsi}/radeon_vcn_enc_2_0.c | 0 .../{radeon => radeonsi}/radeon_vcn_enc_3_0.c | 0 .../{radeon => radeonsi}/radeon_video.c | 0 .../{radeon => radeonsi}/radeon_video.h | 2 +- .../{radeon => radeonsi}/radeon_winsys.h | 0 src/gallium/drivers/radeonsi/si_get.c | 6 +-- src/gallium/drivers/radeonsi/si_pipe.c | 2 +- src/gallium/drivers/radeonsi/si_pm4.h | 2 +- src/gallium/drivers/radeonsi/si_uvd.c | 12 ++--- src/gallium/targets/pipe-loader/pipe_r300.c | 2 +- src/gallium/targets/pipe-loader/pipe_r600.c | 2 +- src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h | 2 +- .../winsys/radeon/drm/radeon_drm_winsys.h | 2 +- 42 files changed, 49 insertions(+), 58 deletions(-) delete mode 100644 src/gallium/drivers/radeon/.dir-locals.el rename src/gallium/drivers/{radeon => radeonsi}/pspdecryptionparam.h (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_efc.h (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_temporal.h (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_uvd.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_uvd.h (98%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_uvd_enc.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_uvd_enc.h (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_uvd_enc_1_1.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vce.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vce.h (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vce_40_2_2.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vce_50.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vce_52.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_av1_default.h (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_dec.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_dec.h (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_dec_jpeg.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_enc.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_enc.h (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_enc_1_2.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_enc_2_0.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_vcn_enc_3_0.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_video.c (100%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_video.h (98%) rename src/gallium/drivers/{radeon => radeonsi}/radeon_winsys.h (100%) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index fc033b433b0..f2d0b90f400 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -469,7 +469,6 @@ when: on_success - changes: &radeon_vcn_file_list - src/gallium/frontends/va/**/* - - src/gallium/drivers/radeon/**/* when: on_success - when: never diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h index 601396a5432..cf788c70f1a 100644 --- a/src/gallium/auxiliary/target-helpers/drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/drm_helper.h @@ -177,7 +177,7 @@ DRM_DRIVER_DESCRIPTOR_STUB(kmsro) #endif #ifdef GALLIUM_R300 -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "radeon/drm/radeon_drm_public.h" #include "r300/r300_public.h" @@ -196,7 +196,7 @@ DRM_DRIVER_DESCRIPTOR_STUB(r300) #endif #ifdef GALLIUM_R600 -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "radeon/drm/radeon_drm_public.h" #include "r600/r600_public.h" diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c index 82a084d56cd..8e3f52476a7 100644 --- a/src/gallium/drivers/r300/r300_chipset.c +++ b/src/gallium/drivers/r300/r300_chipset.c @@ -22,7 +22,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "r300_chipset.h" -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "util/u_debug.h" #include "util/u_memory.h" diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h index 71903289fac..3b68efdcf34 100644 --- a/src/gallium/drivers/r300/r300_screen.h +++ b/src/gallium/drivers/r300/r300_screen.h @@ -25,7 +25,7 @@ #define R300_SCREEN_H #include "r300_chipset.h" -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "pipe/p_screen.h" #include "util/disk_cache.h" #include "util/slab.h" diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h index 4d1c5e84dab..bbfd5484041 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.h +++ b/src/gallium/drivers/r600/r600_pipe_common.h @@ -34,7 +34,7 @@ #include -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "util/disk_cache.h" #include "util/u_blitter.h" diff --git a/src/gallium/drivers/r600/radeon_uvd.h b/src/gallium/drivers/r600/radeon_uvd.h index c371b14414f..14de5fed458 100644 --- a/src/gallium/drivers/r600/radeon_uvd.h +++ b/src/gallium/drivers/r600/radeon_uvd.h @@ -34,7 +34,7 @@ #ifndef RADEON_UVD_H #define RADEON_UVD_H -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "vl/vl_video_buffer.h" /* UVD uses PM4 packet type 0 and 2 */ diff --git a/src/gallium/drivers/r600/radeon_video.h b/src/gallium/drivers/r600/radeon_video.h index 59c9377de08..3f2d33528e1 100644 --- a/src/gallium/drivers/r600/radeon_video.h +++ b/src/gallium/drivers/r600/radeon_video.h @@ -34,7 +34,7 @@ #ifndef RADEON_VIDEO_H #define RADEON_VIDEO_H -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "vl/vl_video_buffer.h" #define RVID_ERR(fmt, args...) \ diff --git a/src/gallium/drivers/radeon/.dir-locals.el b/src/gallium/drivers/radeon/.dir-locals.el deleted file mode 100644 index 15cd68edb0a..00000000000 --- a/src/gallium/drivers/radeon/.dir-locals.el +++ /dev/null @@ -1,11 +0,0 @@ -((prog-mode - (indent-tabs-mode . t) - (tab-width . 8) - (c-basic-offset . 8) - (c-file-style . "stroustrup") - (fill-column . 78) - (eval . (progn - (c-set-offset 'innamespace '0) - (c-set-offset 'inline-open '0))) - ) - ) diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build index ce907aa1590..774bd6356fa 100644 --- a/src/gallium/drivers/radeonsi/meson.build +++ b/src/gallium/drivers/radeonsi/meson.build @@ -72,28 +72,31 @@ files_libradeonsi = files( 'si_test_dma_perf.c', 'si_texture.c', 'si_uvd.c', - '../radeon/radeon_uvd.c', - '../radeon/radeon_uvd.h', - '../radeon/radeon_vcn_enc_1_2.c', - '../radeon/radeon_vcn_enc_2_0.c', - '../radeon/radeon_vcn_enc_3_0.c', - '../radeon/radeon_vcn_enc.c', - '../radeon/radeon_vcn_enc.h', - '../radeon/radeon_vcn_dec_jpeg.c', - '../radeon/radeon_vcn_dec.c', - '../radeon/radeon_vcn_dec.h', - '../radeon/radeon_vcn_av1_default.h', - '../radeon/radeon_uvd_enc_1_1.c', - '../radeon/radeon_uvd_enc.c', - '../radeon/radeon_uvd_enc.h', - '../radeon/radeon_vce_40_2_2.c', - '../radeon/radeon_vce_50.c', - '../radeon/radeon_vce_52.c', - '../radeon/radeon_vce.c', - '../radeon/radeon_vce.h', - '../radeon/radeon_video.c', - '../radeon/radeon_video.h', - '../radeon/radeon_winsys.h', + 'pspdecryptionparam.h', + 'radeon_efc.h', + 'radeon_temporal.h', + 'radeon_uvd.c', + 'radeon_uvd.h', + 'radeon_uvd_enc.c', + 'radeon_uvd_enc.h', + 'radeon_uvd_enc_1_1.c', + 'radeon_vce.c', + 'radeon_vce.h', + 'radeon_vce_40_2_2.c', + 'radeon_vce_50.c', + 'radeon_vce_52.c', + 'radeon_vcn_av1_default.h', + 'radeon_vcn_dec.c', + 'radeon_vcn_dec.h', + 'radeon_vcn_dec_jpeg.c', + 'radeon_vcn_enc.c', + 'radeon_vcn_enc.h', + 'radeon_vcn_enc_1_2.c', + 'radeon_vcn_enc_2_0.c', + 'radeon_vcn_enc_3_0.c', + 'radeon_video.c', + 'radeon_video.h', + 'radeon_winsys.h', ) radeonsi_include_dirs = [inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common, diff --git a/src/gallium/drivers/radeon/pspdecryptionparam.h b/src/gallium/drivers/radeonsi/pspdecryptionparam.h similarity index 100% rename from src/gallium/drivers/radeon/pspdecryptionparam.h rename to src/gallium/drivers/radeonsi/pspdecryptionparam.h diff --git a/src/gallium/drivers/radeon/radeon_efc.h b/src/gallium/drivers/radeonsi/radeon_efc.h similarity index 100% rename from src/gallium/drivers/radeon/radeon_efc.h rename to src/gallium/drivers/radeonsi/radeon_efc.h diff --git a/src/gallium/drivers/radeon/radeon_temporal.h b/src/gallium/drivers/radeonsi/radeon_temporal.h similarity index 100% rename from src/gallium/drivers/radeon/radeon_temporal.h rename to src/gallium/drivers/radeonsi/radeon_temporal.h diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeonsi/radeon_uvd.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_uvd.c rename to src/gallium/drivers/radeonsi/radeon_uvd.c diff --git a/src/gallium/drivers/radeon/radeon_uvd.h b/src/gallium/drivers/radeonsi/radeon_uvd.h similarity index 98% rename from src/gallium/drivers/radeon/radeon_uvd.h rename to src/gallium/drivers/radeonsi/radeon_uvd.h index 739fe29bbdf..15d0312c86a 100644 --- a/src/gallium/drivers/radeon/radeon_uvd.h +++ b/src/gallium/drivers/radeonsi/radeon_uvd.h @@ -28,7 +28,7 @@ #ifndef RADEON_UVD_H #define RADEON_UVD_H -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "vl/vl_video_buffer.h" #include "ac_uvd_dec.h" diff --git a/src/gallium/drivers/radeon/radeon_uvd_enc.c b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_uvd_enc.c rename to src/gallium/drivers/radeonsi/radeon_uvd_enc.c diff --git a/src/gallium/drivers/radeon/radeon_uvd_enc.h b/src/gallium/drivers/radeonsi/radeon_uvd_enc.h similarity index 100% rename from src/gallium/drivers/radeon/radeon_uvd_enc.h rename to src/gallium/drivers/radeonsi/radeon_uvd_enc.h diff --git a/src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c b/src/gallium/drivers/radeonsi/radeon_uvd_enc_1_1.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_uvd_enc_1_1.c rename to src/gallium/drivers/radeonsi/radeon_uvd_enc_1_1.c diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeonsi/radeon_vce.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vce.c rename to src/gallium/drivers/radeonsi/radeon_vce.c diff --git a/src/gallium/drivers/radeon/radeon_vce.h b/src/gallium/drivers/radeonsi/radeon_vce.h similarity index 100% rename from src/gallium/drivers/radeon/radeon_vce.h rename to src/gallium/drivers/radeonsi/radeon_vce.h diff --git a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c b/src/gallium/drivers/radeonsi/radeon_vce_40_2_2.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vce_40_2_2.c rename to src/gallium/drivers/radeonsi/radeon_vce_40_2_2.c diff --git a/src/gallium/drivers/radeon/radeon_vce_50.c b/src/gallium/drivers/radeonsi/radeon_vce_50.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vce_50.c rename to src/gallium/drivers/radeonsi/radeon_vce_50.c diff --git a/src/gallium/drivers/radeon/radeon_vce_52.c b/src/gallium/drivers/radeonsi/radeon_vce_52.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vce_52.c rename to src/gallium/drivers/radeonsi/radeon_vce_52.c diff --git a/src/gallium/drivers/radeon/radeon_vcn_av1_default.h b/src/gallium/drivers/radeonsi/radeon_vcn_av1_default.h similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_av1_default.h rename to src/gallium/drivers/radeonsi/radeon_vcn_av1_default.h diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_dec.c rename to src/gallium/drivers/radeonsi/radeon_vcn_dec.c diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.h b/src/gallium/drivers/radeonsi/radeon_vcn_dec.h similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_dec.h rename to src/gallium/drivers/radeonsi/radeon_vcn_dec.h diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec_jpeg.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_dec_jpeg.c rename to src/gallium/drivers/radeonsi/radeon_vcn_dec_jpeg.c diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_enc.c rename to src/gallium/drivers/radeonsi/radeon_vcn_enc.c diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.h b/src/gallium/drivers/radeonsi/radeon_vcn_enc.h similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_enc.h rename to src/gallium/drivers/radeonsi/radeon_vcn_enc.h diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c rename to src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_2_0.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c rename to src/gallium/drivers/radeonsi/radeon_vcn_enc_2_0.c diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc_3_0.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_vcn_enc_3_0.c rename to src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeonsi/radeon_video.c similarity index 100% rename from src/gallium/drivers/radeon/radeon_video.c rename to src/gallium/drivers/radeonsi/radeon_video.c diff --git a/src/gallium/drivers/radeon/radeon_video.h b/src/gallium/drivers/radeonsi/radeon_video.h similarity index 98% rename from src/gallium/drivers/radeon/radeon_video.h rename to src/gallium/drivers/radeonsi/radeon_video.h index 475107e3729..c1d6604e479 100644 --- a/src/gallium/drivers/radeon/radeon_video.h +++ b/src/gallium/drivers/radeonsi/radeon_video.h @@ -28,7 +28,7 @@ #ifndef RADEON_VIDEO_H #define RADEON_VIDEO_H -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "vl/vl_video_buffer.h" #define RVID_ERR(fmt, args...) \ diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeonsi/radeon_winsys.h similarity index 100% rename from src/gallium/drivers/radeon/radeon_winsys.h rename to src/gallium/drivers/radeonsi/radeon_winsys.h diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index 1cab67ef9cb..e12bfae360a 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -23,9 +23,9 @@ */ #include "compiler/nir/nir.h" -#include "radeon/radeon_uvd_enc.h" -#include "radeon/radeon_vce.h" -#include "radeon/radeon_video.h" +#include "radeon_uvd_enc.h" +#include "radeon_vce.h" +#include "radeon_video.h" #include "si_pipe.h" #include "util/u_cpu_detect.h" #include "util/u_screen.h" diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 1bd1b9f6c19..4e9af094211 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -28,7 +28,7 @@ #include "driver_ddebug/dd_util.h" #include "gallium/winsys/amdgpu/drm/amdgpu_public.h" #include "gallium/winsys/radeon/drm/radeon_drm_public.h" -#include "radeon/radeon_uvd.h" +#include "radeon_uvd.h" #include "si_compute.h" #include "si_public.h" #include "si_shader_internal.h" diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h index 636b622458e..7b5574c12c5 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.h +++ b/src/gallium/drivers/radeonsi/si_pm4.h @@ -25,7 +25,7 @@ #ifndef SI_PM4_H #define SI_PM4_H -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #ifdef __cplusplus extern "C" { diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c index e70987d6650..11436b07350 100644 --- a/src/gallium/drivers/radeonsi/si_uvd.c +++ b/src/gallium/drivers/radeonsi/si_uvd.c @@ -26,12 +26,12 @@ **************************************************************************/ #include "drm-uapi/drm_fourcc.h" -#include "radeon/radeon_uvd.h" -#include "radeon/radeon_uvd_enc.h" -#include "radeon/radeon_vce.h" -#include "radeon/radeon_vcn_dec.h" -#include "radeon/radeon_vcn_enc.h" -#include "radeon/radeon_video.h" +#include "radeon_uvd.h" +#include "radeon_uvd_enc.h" +#include "radeon_vce.h" +#include "radeon_vcn_dec.h" +#include "radeon_vcn_enc.h" +#include "radeon_video.h" #include "si_pipe.h" #include "util/u_video.h" diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c index 81cc13a343f..eeca74d6e87 100644 --- a/src/gallium/targets/pipe-loader/pipe_r300.c +++ b/src/gallium/targets/pipe-loader/pipe_r300.c @@ -2,5 +2,5 @@ #include "target-helpers/inline_debug_helper.h" #include "frontend/drm_driver.h" #include "radeon/drm/radeon_drm_public.h" -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "r300/r300_public.h" diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c index 3c07d6f70da..381bcf30046 100644 --- a/src/gallium/targets/pipe-loader/pipe_r600.c +++ b/src/gallium/targets/pipe-loader/pipe_r600.c @@ -2,5 +2,5 @@ #include "target-helpers/drm_helper.h" #include "target-helpers/inline_debug_helper.h" #include "radeon/drm/radeon_drm_public.h" -#include "radeon/radeon_winsys.h" +#include "radeonsi/radeon_winsys.h" #include "r600/r600_public.h" diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h index 26e81f94d5f..de08a68f164 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h @@ -30,7 +30,7 @@ #include "pipebuffer/pb_cache.h" #include "pipebuffer/pb_slab.h" -#include "gallium/drivers/radeon/radeon_winsys.h" +#include "gallium/drivers/radeonsi/radeon_winsys.h" #include "util/simple_mtx.h" #include "util/u_queue.h" #include diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h index c34d8e3d678..c1d140813bc 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h @@ -27,7 +27,7 @@ #ifndef RADEON_DRM_WINSYS_H #define RADEON_DRM_WINSYS_H -#include "gallium/drivers/radeon/radeon_winsys.h" +#include "gallium/drivers/radeonsi/radeon_winsys.h" #include "pipebuffer/pb_cache.h" #include "pipebuffer/pb_slab.h" #include "util/u_queue.h"