X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2FAndroid.gen.mk;h=f326143d7912a77ea41f820a8e969a3537ae3afd;hb=a0f84396913d478c926626593514de1ab6ebb439;hp=145f2594cda908f8fb3b7329c933a90c90beda08;hpb=6ee082718fca884fbda73001e0ecb32095409549;p=mesa.git diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk index 145f2594cda..f326143d791 100644 --- a/src/mesa/Android.gen.mk +++ b/src/mesa/Android.gen.mk @@ -34,25 +34,26 @@ sources := \ main/enums.c \ main/api_exec.c \ main/dispatch.h \ + main/format_fallback.c \ main/format_pack.c \ main/format_unpack.c \ main/format_info.h \ main/remap_helper.h \ - main/get_hash.h + main/get_hash.h \ + main/marshal_generated0.c \ + main/marshal_generated1.c \ + main/marshal_generated2.c \ + main/marshal_generated3.c \ + main/marshal_generated4.c \ + main/marshal_generated5.c \ + main/marshal_generated6.c \ + main/marshal_generated7.c \ + main/marshal_generated.h LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) LOCAL_C_INCLUDES += $(intermediates)/main -ifeq ($(strip $(MESA_ENABLE_ASM)),true) -ifeq ($(TARGET_ARCH),x86) -sources += x86/matypes.h -LOCAL_C_INCLUDES += $(intermediates)/x86 -endif -endif - -sources += main/git_sha1.h - sources := $(addprefix $(intermediates)/, $(sources)) LOCAL_GENERATED_SOURCES += $(sources) @@ -69,26 +70,6 @@ define es-gen $(hide) $(PRIVATE_SCRIPT) $(1) $(PRIVATE_XML) > $@ endef -$(intermediates)/main/git_sha1.h: - @mkdir -p $(dir $@) - @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" - $(hide) touch $@ - $(hide) if which git > /dev/null; then \ - git --git-dir $(PRIVATE_PATH)/../../.git log -n 1 --oneline | \ - sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \ - > $@; \ - fi - -matypes_deps := \ - $(BUILD_OUT_EXECUTABLES)/mesa_gen_matypes$(BUILD_EXECUTABLE_SUFFIX) \ - $(LOCAL_PATH)/main/mtypes.h \ - $(LOCAL_PATH)/tnl/t_context.h - -$(intermediates)/x86/matypes.h: $(matypes_deps) - @mkdir -p $(dir $@) - @echo "MATYPES: $(PRIVATE_MODULE) <= $(notdir $@)" - $(hide) $< > $@ - $(intermediates)/main/dispatch.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_table.py $(intermediates)/main/dispatch.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml @@ -102,7 +83,7 @@ $(intermediates)/main/remap_helper.h: $(dispatch_deps) $(call es-gen, $*) $(intermediates)/main/enums.c: PRIVATE_SCRIPT :=$(MESA_PYTHON2) $(glapi)/gl_enums.py -$(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml +$(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/../registry/gl.xml $(intermediates)/main/enums.c: $(dispatch_deps) $(call es-gen) @@ -113,6 +94,60 @@ $(intermediates)/main/api_exec.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml $(intermediates)/main/api_exec.c: $(dispatch_deps) $(call es-gen) +$(intermediates)/main/marshal_generated0.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py +$(intermediates)/main/marshal_generated0.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 0 -n 8 + +$(intermediates)/main/marshal_generated0.c: $(dispatch_deps) + $(call es-gen) + +$(intermediates)/main/marshal_generated1.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py +$(intermediates)/main/marshal_generated1.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 1 -n 8 + +$(intermediates)/main/marshal_generated1.c: $(dispatch_deps) + $(call es-gen) + +$(intermediates)/main/marshal_generated2.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py +$(intermediates)/main/marshal_generated2.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 2 -n 8 + +$(intermediates)/main/marshal_generated2.c: $(dispatch_deps) + $(call es-gen) + +$(intermediates)/main/marshal_generated3.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py +$(intermediates)/main/marshal_generated3.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 3 -n 8 + +$(intermediates)/main/marshal_generated3.c: $(dispatch_deps) + $(call es-gen) + +$(intermediates)/main/marshal_generated4.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py +$(intermediates)/main/marshal_generated4.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 4 -n 8 + +$(intermediates)/main/marshal_generated4.c: $(dispatch_deps) + $(call es-gen) + +$(intermediates)/main/marshal_generated5.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py +$(intermediates)/main/marshal_generated5.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 5 -n 8 + +$(intermediates)/main/marshal_generated5.c: $(dispatch_deps) + $(call es-gen) + +$(intermediates)/main/marshal_generated6.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py +$(intermediates)/main/marshal_generated6.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 6 -n 8 + +$(intermediates)/main/marshal_generated6.c: $(dispatch_deps) + $(call es-gen) + +$(intermediates)/main/marshal_generated7.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal.py +$(intermediates)/main/marshal_generated7.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml -i 7 -n 8 + +$(intermediates)/main/marshal_generated7.c: $(dispatch_deps) + $(call es-gen) + +$(intermediates)/main/marshal_generated.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_marshal_h.py +$(intermediates)/main/marshal_generated.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml + +$(intermediates)/main/marshal_generated.h: $(dispatch_deps) + $(call es-gen) + GET_HASH_GEN := $(LOCAL_PATH)/main/get_hash_generator.py $(intermediates)/main/get_hash.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(GET_HASH_GEN) @@ -121,6 +156,17 @@ $(intermediates)/main/get_hash.h: $(glapi)/gl_and_es_API.xml \ $(LOCAL_PATH)/main/get_hash_params.py $(GET_HASH_GEN) $(call es-gen) +FORMAT_FALLBACK := $(LOCAL_PATH)/main/format_fallback.py +format_fallback_deps := \ + $(LOCAL_PATH)/main/formats.csv \ + $(LOCAL_PATH)/main/format_parser.py \ + $(FORMAT_FALLBACK) + +$(intermediates)/main/format_fallback.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(FORMAT_FALLBACK) +$(intermediates)/main/format_fallback.c: PRIVATE_XML := +$(intermediates)/main/format_fallback.c: $(format_fallback_deps) + $(call es-gen, $< /dev/stdout) + FORMAT_INFO := $(LOCAL_PATH)/main/format_info.py format_info_deps := \ $(LOCAL_PATH)/main/formats.csv \