fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 04:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

android: amd/registers: switch to new generated register definitions

Browse source 
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@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6618>
This commit is contained in:
Mauro Rossi 2020-09-05 17:59:48 +02:00
parent e8d55e6db3
commit fb42d73a9d
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/amd/Android.common.mk
View file

@ -42,23 +42,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-generated-sources-dir)
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES))
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
$(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS)
@mkdir -p $(dir $@)
@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
$(hide) $(MESA_PYTHON2) $(SID_TABLES) $(SID_TABLES_INPUTS) > $@ || ($(RM) $@; false)
AMDGFXREGS := $(LOCAL_PATH)/registers/makeregheader.py
AMDGFXREGS_INPUTS := \
AMD_JSON_FILES := \
$(LOCAL_PATH)/registers/gfx6.json \
$(LOCAL_PATH)/registers/gfx7.json \
$(LOCAL_PATH)/registers/gfx8.json \
@ -70,6 +54,22 @@ AMDGFXREGS_INPUTS := \
$(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 \
$(AMD_JSON_FILES)
$(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS)
@mkdir -p $(dir $@)
@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
$(hide) $(MESA_PYTHON2) $(SID_TABLES) $(SID_TABLES_INPUTS) > $@ || ($(RM) $@; false)
AMDGFXREGS := $(LOCAL_PATH)/registers/makeregheader.py
AMDGFXREGS_INPUTS := \
$(AMD_JSON_FILES)
$(intermediates)/common/amdgfxregs.h: $(AMDGFXREGS) $(AMDGFXREGS_INPUTS)
@mkdir -p $(dir $@)
@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"