diff options
| author | Mauro Rossi <[email protected]> | 2019-07-08 01:17:22 +0200 |
|---|---|---|
| committer | Mauro Rossi <[email protected]> | 2019-07-16 21:31:24 +0200 |
| commit | 3630988b1d7ef200a2b3e9b360eb812b84d96afc (patch) | |
| tree | 2dde5a3a9997b64ea8f35ecfadefe5f1d1ec251b | |
| parent | 856e84083eee9b22408a23d4eeec246e64adfac2 (diff) | |
android: radv/gfx10: generate gfx10_format_table.h
This patch adds the missing building rules for Android,
to avoid following building errors:
In file included from external/mesa/src/amd/vulkan/radv_debug.c:35:
In file included from external/mesa/src/amd/vulkan/radv_debug.h:27:
external/mesa/src/amd/vulkan/radv_private.h:95:10:
fatal error: 'gfx10_format_table.h' file not found
^~~~~~~~~~~~~~~~~~~~~~
1 error generated.
In file included from external/mesa/src/amd/vulkan/radv_android.c:31:
external/mesa/src/amd/vulkan/radv_private.h:95:10:
fatal error: 'gfx10_format_table.h' file not found
^~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Fixes: 3dc5ec5d16 ("radv/gfx10: generate gfx10_format_table.h")
Signed-off-by: Mauro Rossi <[email protected]>
Acked-by: Samuel Pitoiset <[email protected]>
| -rw-r--r-- | src/amd/vulkan/Android.mk | 15 | ||||
| -rw-r--r-- | src/amd/vulkan/Makefile.sources | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk index 322620f36ef..d0002b8aac5 100644 --- a/src/amd/vulkan/Android.mk +++ b/src/amd/vulkan/Android.mk @@ -78,6 +78,7 @@ LOCAL_GENERATED_SOURCES += $(intermediates)/radv_entrypoints.h LOCAL_GENERATED_SOURCES += $(intermediates)/radv_extensions.c LOCAL_GENERATED_SOURCES += $(intermediates)/radv_extensions.h LOCAL_GENERATED_SOURCES += $(intermediates)/vk_format_table.c +LOCAL_GENERATED_SOURCES += $(intermediates)/gfx10_format_table.h RADV_ENTRYPOINTS_SCRIPT := $(MESA_TOP)/src/amd/vulkan/radv_entrypoints_gen.py RADV_EXTENSIONS_SCRIPT := $(MESA_TOP)/src/amd/vulkan/radv_extensions.py @@ -112,6 +113,20 @@ $(intermediates)/vk_format_table.c: $(VK_FORMAT_TABLE_SCRIPT) \ @mkdir -p $(dir $@) $(MESA_PYTHON2) $(VK_FORMAT_TABLE_SCRIPT) $(vk_format_layout_csv) > $@ +RADV_GEN10_FORMAT_TABLE_INPUTS := \ + $(MESA_TOP)/src/amd/vulkan/vk_format_layout.csv \ + $(MESA_TOP)/src/amd/registers/gfx10-rsrc.json + +RADV_GEN10_FORMAT_TABLE_DEP := \ + $(MESA_TOP)/src/amd/registers/regdb.py + +RADV_GEN10_FORMAT_TABLE := $(LOCAL_PATH)/gfx10_format_table.py + +$(intermediates)/gfx10_format_table.h: $(RADV_GEN10_FORMAT_TABLE) $(RADV_GEN10_FORMAT_TABLE_INPUTS) $(RADV_GEN10_FORMAT_TABLE_DEP) + @mkdir -p $(dir $@) + @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" + $(hide) $(MESA_PYTHON2) $(RADV_GEN10_FORMAT_TABLE) $(RADV_GEN10_FORMAT_TABLE_INPUTS) > $@ || ($(RM) $@; false) + LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES) LOCAL_EXPORT_C_INCLUDE_DIRS := \ diff --git a/src/amd/vulkan/Makefile.sources b/src/amd/vulkan/Makefile.sources index df90c1150af..312cd0b1e99 100644 --- a/src/amd/vulkan/Makefile.sources +++ b/src/amd/vulkan/Makefile.sources @@ -91,5 +91,6 @@ VULKAN_GENERATED_FILES := \ radv_entrypoints.h \ radv_extensions.c \ radv_extensions.h \ - vk_format_table.c + vk_format_table.c \ + gfx10_format_table.h |