X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2FAndroid.common.mk;h=6b83f39662fe01993b4c27d292abff95b5f6c283;hb=286795803c94f14bb0a11366dc1b6f8e497cd8df;hp=f77aa79c7d86e5af789990a8cbcf119fe8d6e385;hpb=3a08110d43ce268747d034cae03787080967bf71;p=mesa.git

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index f77aa79c7d8..6b83f39662f 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -20,6 +20,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+ifeq ($(MESA_ENABLE_LLVM),true)
+
 # ---------------------------------------
 # Build libmesa_amd_common
 # ---------------------------------------
@@ -57,16 +59,36 @@ $(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS)
 AMDGFXREGS := $(LOCAL_PATH)/registers/makeregheader.py
 
 AMDGFXREGS_INPUTS := \
-	$(LOCAL_PATH)/registers/amdgfxregs.json \
-	$(LOCAL_PATH)/registers/pkt3.json \
+	$(LOCAL_PATH)/registers/gfx6.json \
+	$(LOCAL_PATH)/registers/gfx7.json \
+	$(LOCAL_PATH)/registers/gfx8.json \
+	$(LOCAL_PATH)/registers/gfx81.json \
+	$(LOCAL_PATH)/registers/gfx9.json \
 	$(LOCAL_PATH)/registers/gfx10.json \
-	$(LOCAL_PATH)/registers/gfx10-rsrc.json
+	$(LOCAL_PATH)/registers/gfx103.json \
+	$(LOCAL_PATH)/registers/pkt3.json \
+	$(LOCAL_PATH)/registers/gfx10-rsrc.json \
+	$(LOCAL_PATH)/registers/registers-manually-defined.json
 
 $(intermediates)/common/amdgfxregs.h: $(AMDGFXREGS) $(AMDGFXREGS_INPUTS)
 	@mkdir -p $(dir $@)
 	@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
 	$(hide) $(MESA_PYTHON2) $(AMDGFXREGS) $(AMDGFXREGS_INPUTS) --sort address --guard AMDGFXREGS_H > $@ || ($(RM) $@; false)
 
+GEN10_FORMAT_TABLE_INPUTS := \
+	$(MESA_TOP)/src/util/format/u_format.csv \
+	$(MESA_TOP)/src/amd/registers/gfx10-rsrc.json
+
+GEN10_FORMAT_TABLE_DEP := \
+	$(MESA_TOP)/src/amd/registers/regdb.py
+
+GEN10_FORMAT_TABLE := $(LOCAL_PATH)/common/gfx10_format_table.py
+
+$(intermediates)/common/gfx10_format_table.c: $(GEN10_FORMAT_TABLE) $(GEN10_FORMAT_TABLE_INPUTS) $(GEN10_FORMAT_TABLE_DEP)
+	@mkdir -p $(dir $@)
+	@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
+	$(hide) $(MESA_PYTHON2) $(GEN10_FORMAT_TABLE) $(GEN10_FORMAT_TABLE_INPUTS) > $@ || ($(RM) $@; false)
+
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/include \
 	$(MESA_TOP)/src \
@@ -81,6 +103,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(LOCAL_PATH)/common \
+	$(LOCAL_PATH)/llvm \
 	$(intermediates)/common
 
 LOCAL_SHARED_LIBRARIES := \
@@ -96,3 +119,5 @@ $(call mesa-build-with-llvm)
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+endif # MESA_ENABLE_LLVM == true