From: Mauro Rossi Date: Sat, 22 Feb 2020 15:20:10 +0000 (+0100) Subject: android: aco: fix PIPE_FORMAT related building errors X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=01778d1e3cc675e6c7627e5b7ef7acd5ad290bfb;p=mesa.git android: aco: fix PIPE_FORMAT related building errors Fixes the following building errors: In file included from external/mesa/src/amd/compiler/aco_dead_code_analysis.cpp:25: In file included from external/mesa/src/amd/compiler/aco_ir.h:33: In file included from external/mesa/src/compiler/nir/nir.h:40: external/mesa/src/util/format/u_format.h:33:10: fatal error: 'pipe/p_format.h' file not found #include "pipe/p_format.h" ^~~~~~~~~~~~~~~~~ ... In file included from external/mesa/src/amd/compiler/aco_dominance.cpp:31: In file included from external/mesa/src/amd/compiler/aco_ir.h:33: In file included from external/mesa/src/compiler/nir/nir.h:40: external/mesa/src/util/format/u_format.h:33:10: fatal error: 'pipe/p_format.h' file not found #include "pipe/p_format.h" ^~~~~~~~~~~~~~~~~ ... In file included from external/mesa/src/amd/compiler/aco_instruction_selection.cpp:31: In file included from external/mesa/src/amd/common/ac_shader_util.h:32: In file included from external/mesa/src/compiler/nir/nir.h:40: external/mesa/src/util/format/u_format.h:33:10: fatal error: 'pipe/p_format.h' file not found #include "pipe/p_format.h" ^~~~~~~~~~~~~~~~~ 3 errors generated. Fixes: 8d07d661 ("glsl,nir: Switch the enum representing shader image formats to PIPE_FORMAT.") Signed-off-by: Mauro Rossi Reviewed-by: Gert Wollny --- diff --git a/src/amd/Android.compiler.mk b/src/amd/Android.compiler.mk index a62c93d9d33..3f544ac3cf1 100644 --- a/src/amd/Android.compiler.mk +++ b/src/amd/Android.compiler.mk @@ -72,6 +72,7 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/amd/common \ $(MESA_TOP)/src/amd/compiler \ $(MESA_TOP)/src/compiler/nir \ + $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa \ $(intermediates)/compiler