NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mesa: Add ir3/ir3_nir_imul.c generation to Android.mk

Browse source 
With current master we're seeing build failures with AOSP:
  error: undefined symbol: ir3_nir_lower_imul

This is due to the ir3_nir_imul.c file not being generated
in the Android.mk files.

This patch simply adds it to the Android build, after which
thigns build and book ok on db410c.

Cc: Rob Clark <robdclark@chromium.org>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Greg Hartman <ghartman@google.com>
Cc: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: John Stultz <john.stultz@linaro.org>
This commit is contained in:
John Stultz 2019-07-03 22:37:45 +00:00
parent 16edd56fcc
commit 96baf052b2
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/freedreno/Makefile.sources
View file

@ -48,4 +48,5 @@ ir3_SOURCES := \
ir3/ir3_sun.c
ir3_GENERATED_FILES := \
ir3/ir3_nir_trig.c
ir3/ir3_nir_trig.c \
ir3/ir3_nir_imul.c

8
src/gallium/drivers/freedreno/Android.gen.mk
View file

@ -28,11 +28,19 @@ ir3_nir_trig_deps := \
$(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \
$(MESA_TOP)/src/compiler/nir/nir_algebraic.py
ir3_nir_imul_deps := \
$(MESA_TOP)/src/freedreno/ir3/ir3_nir_imul.py \
$(MESA_TOP)/src/compiler/nir/nir_algebraic.py
intermediates := $(call local-generated-sources-dir)
$(intermediates)/ir3/ir3_nir_trig.c: $(ir3_nir_trig_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@
$(intermediates)/ir3/ir3_nir_imul.c: $(ir3_nir_imul_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
$(ir3_GENERATED_FILES))