[Mesa-dev] [PATCH] Android: fix a missing nir_intrinsics.h error

[Tapani Pälli]

I haven't experienced this error but changes LGTM:

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 05/24/2018 10:10 AM, Chih-Wei Huang wrote:
> The commit 76dfed8ae2d5 changed nir_intrinsics.h to be a generated
> header, but the corresponding dependency was not updated for Android.
> It causes the error:
> 
> [  0% 19/4336] target  C: libmesa_pipe_radeonsi <= external/mesa/src/gallium/drivers/radeonsi/si_debug.c
> ...
> In file included from external/mesa/src/gallium/drivers/radeonsi/si_debug.c:25:
> In file included from external/mesa/src/gallium/drivers/radeonsi/si_pipe.h:28:
> In file included from external/mesa/src/gallium/drivers/radeonsi/si_shader.h:140:
> In file included from external/mesa/src/amd/common/ac_llvm_build.h:30:
> external/mesa/src/compiler/nir/nir.h:966:10: fatal error: 'nir_intrinsics.h' file not found
>           ^~~~~~~~~~~~~~~~~~
> 1 error generated.
> 
> Fixes: 76dfed8ae2d5 ("nir: mako all the intrinsics")
> Signed-off-by: Chih-Wei Huang <cwhuang at linux.org.tw>
> ---
>   src/compiler/Android.nir.gen.mk         | 1 +
>   src/gallium/drivers/radeonsi/Android.mk | 2 ++
>   2 files changed, 3 insertions(+)
> 
> diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk
> index fa0707e..894fb12 100644
> --- a/src/compiler/Android.nir.gen.mk
> +++ b/src/compiler/Android.nir.gen.mk
> @@ -46,6 +46,7 @@ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
>   # Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this
>   MESA_GEN_NIR_H := $(addprefix $(call local-generated-sources-dir)/, \
>   	nir/nir_opcodes.h \
> +	nir/nir_intrinsics.h \
>   	nir/nir_builder_opcodes.h)
>   
>   nir_builder_opcodes_gen := $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py
> diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk
> index e72b80c..76309a4 100644
> --- a/src/gallium/drivers/radeonsi/Android.mk
> +++ b/src/gallium/drivers/radeonsi/Android.mk
> @@ -46,6 +46,8 @@ LOCAL_MODULE := libmesa_pipe_radeonsi
>   
>   intermediates := $(call local-generated-sources-dir)
>   
> +# We need to get NIR's generated headers.
> +LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
>   LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/radeonsi/,$(GENERATED_SOURCES))
>   
>   GEN_DRIINFO_INPUTS := \
>