Module: Mesa Branch: main Commit: c78aa6a417d40bb221c6f3a8cb07a531313cb79e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c78aa6a417d40bb221c6f3a8cb07a531313cb79e
Author: Vitaliy Triang3l Kuzmin <trian...@yandex.ru> Date: Sat Oct 7 20:10:47 2023 +0300 r600/sfn: Make r600 header include paths relative Fixes building SFN without the R600 Gallium driver in the #include paths Signed-off-by: Vitaliy Triang3l Kuzmin <trian...@yandex.ru> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25695> --- src/gallium/drivers/r600/sfn/sfn_nir.cpp | 3 ++- src/gallium/drivers/r600/sfn/sfn_scheduler.cpp | 3 ++- src/gallium/drivers/r600/sfn/sfn_split_address_loads.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index d03116c6023..601769252d2 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -26,12 +26,13 @@ #include "sfn_nir.h" +#include "../r600_asm.h" #include "../r600_pipe.h" #include "../r600_shader.h" + #include "nir.h" #include "nir_builder.h" #include "nir_intrinsics.h" -#include "r600_asm.h" #include "sfn_assembler.h" #include "sfn_debug.h" #include "sfn_instr_tex.h" diff --git a/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp b/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp index 1106e21fd95..75180ab01f4 100644 --- a/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp @@ -26,8 +26,9 @@ #include "sfn_scheduler.h" +#include "../r600_isa.h" + #include "amd_family.h" -#include "r600_isa.h" #include "sfn_alu_defines.h" #include "sfn_debug.h" #include "sfn_instr_alugroup.h" diff --git a/src/gallium/drivers/r600/sfn/sfn_split_address_loads.cpp b/src/gallium/drivers/r600/sfn/sfn_split_address_loads.cpp index 0336c6b47eb..a1300a1aff6 100644 --- a/src/gallium/drivers/r600/sfn/sfn_split_address_loads.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_split_address_loads.cpp @@ -24,8 +24,9 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "../r600_isa.h" + #include "sfn_split_address_loads.h" -#include "r600_isa.h" #include "sfn_alu_defines.h" #include "sfn_defines.h" #include "sfn_instr_alugroup.h"
