From e213bfd3304856b671ef62fb5d144a8f5673cf78 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sun, 25 Apr 2021 15:48:28 +0200 Subject: [PATCH] android: gallium/radeonsi: add nir include path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since generated nir headers are included, it makes sense to include nir path Fixes the following building error: FAILED: out/target/product/x86_64/obj/STATIC_LIBRARIES/libmesa_pipe_radeonsi_intermediates/si_shader_nir.o ... In file included from external/mesa/src/gallium/drivers/radeonsi/si_shader_nir.c:26: external/mesa/src/amd/common/ac_nir.h:29:10: fatal error: 'nir.h' file not found ^~~~~~~ 1 error generated. Cc: 21.0 21.1 Fixes: 1c702a82397b ("ac: move ac_lower_indirect_derefs() outside of the LLVM dir") Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index 1c1106dd85b..75f30f6212f 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -39,6 +39,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/amd/common \ $(MESA_TOP)/src/amd/llvm \ + $(MESA_TOP)/src/compiler/nir \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir