Mesa (master): android: amd/registers: switch to new generated register definitions
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Sep 6 18:40:02 UTC 2020
Module: Mesa
Branch: master
Commit: fb42d73a9d9c49043e15fe747a3376dad663c9b1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb42d73a9d9c49043e15fe747a3376dad663c9b1
Author: Mauro Rossi <issor.oruam at gmail.com>
Date: Sat Sep 5 17:59:48 2020 +0200
android: amd/registers: switch to new generated register definitions
Android building rules are aligned to meson ones
Fixes the following building error:
FAILED: ninja: 'external/mesa/src/amd/registers/amdgfxregs.json',
needed by 'out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_amd_common_intermediates/common/sid_tables.h',
missing and no known rule to make it
Fixes: b7a6333ee ("amd/registers: switch to new generated register definitions")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6618>
---
src/amd/Android.common.mk | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 6b83f39662f..d9aa66fd23e 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -42,14 +42,23 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-generated-sources-dir)
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES))
+AMD_JSON_FILES := \
+ $(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/gfx103.json \
+ $(LOCAL_PATH)/registers/pkt3.json \
+ $(LOCAL_PATH)/registers/gfx10-rsrc.json \
+ $(LOCAL_PATH)/registers/registers-manually-defined.json
+
SID_TABLES := $(LOCAL_PATH)/common/sid_tables.py
SID_TABLES_INPUTS := \
$(LOCAL_PATH)/common/sid.h \
- $(LOCAL_PATH)/registers/amdgfxregs.json \
- $(LOCAL_PATH)/registers/pkt3.json \
- $(LOCAL_PATH)/registers/gfx10.json \
- $(LOCAL_PATH)/registers/gfx10-rsrc.json
+ $(AMD_JSON_FILES)
$(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS)
@mkdir -p $(dir $@)
@@ -59,16 +68,7 @@ $(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS)
AMDGFXREGS := $(LOCAL_PATH)/registers/makeregheader.py
AMDGFXREGS_INPUTS := \
- $(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/gfx103.json \
- $(LOCAL_PATH)/registers/pkt3.json \
- $(LOCAL_PATH)/registers/gfx10-rsrc.json \
- $(LOCAL_PATH)/registers/registers-manually-defined.json
+ $(AMD_JSON_FILES)
$(intermediates)/common/amdgfxregs.h: $(AMDGFXREGS) $(AMDGFXREGS_INPUTS)
@mkdir -p $(dir $@)
More information about the mesa-commit
mailing list