radeonsi/nir: fix scanning of bindless images

[mesa.git] / src / gallium / drivers / radeonsi / Android.mk

diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk
index 5676c55983fc8d48a14db9d38d8fe9d6da08237e..76309a4ebc2b8450aa422427b659f3ba35da502a 100644 (file)
--- a/src/gallium/drivers/radeonsi/Android.mk
+++ b/src/gallium/drivers/radeonsi/Android.mk
@@ -36,19 +36,40 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/amd/common \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common \
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir
 
 LOCAL_STATIC_LIBRARIES := libmesa_amd_common
 
-LOCAL_SHARED_LIBRARIES := libdrm_radeon libLLVM
+LOCAL_SHARED_LIBRARIES := libdrm_radeon
 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 := \
+       $(MESA_TOP)/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h \
+       $(LOCAL_PATH)/driinfo_radeonsi.h
+
+MERGE_DRIINFO := $(MESA_TOP)/src/util/merge_driinfo.py
+
+$(intermediates)/radeonsi/si_driinfo.h: $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS)
+       @mkdir -p $(dir $@)
+       @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
+       $(hide) $(MESA_PYTHON2) $(MERGE_DRIINFO) $(GEN_DRIINFO_INPUTS) > $@ || ($(RM) $@; false)
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
+
 $(call mesa-build-with-llvm)
 
 include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
 ifneq ($(HAVE_GALLIUM_RADEONSI),)
+GALLIUM_TARGET_DRIVERS += radeonsi
 $(eval GALLIUM_LIBS += \
        $(LOCAL_MODULE) \
        $(LOCAL_STATIC_LIBRARIES) \