From f1806af862b9060f067c139f3579ef2d8bd5e1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Thu, 1 Dec 2022 08:54:58 +0000 Subject: Use Python 3 in Mesa build scripts. Bug: 203436762 Test: lunch aosp_cf_x86_64_phone-userdebug; m libGLES_mesa Change-Id: I154785fcfd397eace28c11d151f182149870e127 --- Android.mk | 1 - aosp-gen-prebuilt.sh | 66 ++++++++++++++++++------------------ src/amd/Android.common.mk | 6 ++-- src/amd/Android.compiler.mk | 6 ++-- src/amd/vulkan/Android.mk | 6 ++-- src/broadcom/Android.genxml.mk | 4 +-- src/compiler/Android.glsl.gen.mk | 2 +- src/gallium/auxiliary/Android.mk | 2 +- src/gallium/drivers/r600/Android.mk | 2 +- src/intel/Android.genxml.mk | 20 +++++------ src/mapi/Android.mk | 2 +- src/mesa/Android.gen.mk | 32 ++++++++--------- src/mesa/Android.libmesa_git_sha1.mk | 2 +- src/mesa/drivers/dri/i965/Android.mk | 2 +- src/util/Android.mk | 6 ++-- 15 files changed, 78 insertions(+), 81 deletions(-) diff --git a/Android.mk b/Android.mk index f70143b5c8a..aea610b2fa1 100644 --- a/Android.mk +++ b/Android.mk @@ -51,7 +51,6 @@ MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(M MESA_DRI_LDFLAGS := -Wl,--build-id=sha1 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk -MESA_PYTHON2 := python MESA_PYTHON3 := python3 ifeq ($(filter 5 6 7 8 9 10, $(MESA_ANDROID_MAJOR_VERSION)),) MESA_LEX := M4=$(M4) $(LEX) diff --git a/aosp-gen-prebuilt.sh b/aosp-gen-prebuilt.sh index 4d9633847f0..28b0c927894 100755 --- a/aosp-gen-prebuilt.sh +++ b/aosp-gen-prebuilt.sh @@ -1,39 +1,39 @@ mkdir -p prebuilt-intermediates/{glsl,ir3,main,nir,spirv,cle,isl,perf,genxml,compiler,lima,midgard,iris,util,virgl,vulkan,bifrost} -python src/compiler/glsl/ir_expression_operation.py strings > prebuilt-intermediates/glsl/ir_expression_operation_strings.h -python src/compiler/glsl/ir_expression_operation.py constant > prebuilt-intermediates/glsl/ir_expression_operation_constant.h -python src/compiler/glsl/ir_expression_operation.py enum > prebuilt-intermediates/glsl/ir_expression_operation.h +python3 src/compiler/glsl/ir_expression_operation.py strings > prebuilt-intermediates/glsl/ir_expression_operation_strings.h +python3 src/compiler/glsl/ir_expression_operation.py constant > prebuilt-intermediates/glsl/ir_expression_operation_constant.h +python3 src/compiler/glsl/ir_expression_operation.py enum > prebuilt-intermediates/glsl/ir_expression_operation.h -python src/freedreno/ir3/ir3_nir_trig.py -p src/compiler/nir > prebuilt-intermediates/ir3/ir3_nir_trig.c -python src/freedreno/ir3/ir3_nir_imul.py -p src/compiler/nir > prebuilt-intermediates/ir3/ir3_nir_imul.c +python3 src/freedreno/ir3/ir3_nir_trig.py -p src/compiler/nir > prebuilt-intermediates/ir3/ir3_nir_trig.c +python3 src/freedreno/ir3/ir3_nir_imul.py -p src/compiler/nir > prebuilt-intermediates/ir3/ir3_nir_imul.c -python src/mesa/main/format_pack.py src/mesa/main/formats.csv > prebuilt-intermediates/main/format_pack.c -python src/mesa/main/format_unpack.py src/mesa/main/formats.csv > prebuilt-intermediates/main/format_unpack.c -python src/mesa/main/format_fallback.py src/mesa/main/formats.csv /dev/stdout > prebuilt-intermediates/main/format_fallback.c +python3 src/mesa/main/format_pack.py src/mesa/main/formats.csv > prebuilt-intermediates/main/format_pack.c +python3 src/mesa/main/format_unpack.py src/mesa/main/formats.csv > prebuilt-intermediates/main/format_unpack.c +python3 src/mesa/main/format_fallback.py src/mesa/main/formats.csv /dev/stdout > prebuilt-intermediates/main/format_fallback.c -python src/compiler/nir/nir_builder_opcodes_h.py src/compiler/nir/nir_opcodes.py > prebuilt-intermediates/nir/nir_builder_opcodes.h -python src/compiler/nir/nir_constant_expressions.py src/compiler/nir/nir_opcodes.py > prebuilt-intermediates/nir/nir_constant_expressions.c -python src/compiler/nir/nir_opcodes_c.py src/compiler/nir/nir_opcodes.py > prebuilt-intermediates/nir/nir_opcodes.c -python src/compiler/nir/nir_opcodes_h.py src/compiler/nir/nir_opcodes.py > prebuilt-intermediates/nir/nir_opcodes.h -python src/compiler/nir/nir_opt_algebraic.py src/compiler/nir/nir_opt_algebraic.py > prebuilt-intermediates/nir/nir_opt_algebraic.c -python src/compiler/nir/nir_intrinsics_c.py --outdir prebuilt-intermediates/nir/ || ( prebuilt-intermediates/nir/nir_intrinsics.c; false) -python src/compiler/nir/nir_intrinsics_h.py --outdir prebuilt-intermediates/nir/ || ( prebuilt-intermediates/nir/nir_intrinsics.h; false) +python3 src/compiler/nir/nir_builder_opcodes_h.py src/compiler/nir/nir_opcodes.py > prebuilt-intermediates/nir/nir_builder_opcodes.h +python3 src/compiler/nir/nir_constant_expressions.py src/compiler/nir/nir_opcodes.py > prebuilt-intermediates/nir/nir_constant_expressions.c +python3 src/compiler/nir/nir_opcodes_c.py src/compiler/nir/nir_opcodes.py > prebuilt-intermediates/nir/nir_opcodes.c +python3 src/compiler/nir/nir_opcodes_h.py src/compiler/nir/nir_opcodes.py > prebuilt-intermediates/nir/nir_opcodes.h +python3 src/compiler/nir/nir_opt_algebraic.py src/compiler/nir/nir_opt_algebraic.py > prebuilt-intermediates/nir/nir_opt_algebraic.c +python3 src/compiler/nir/nir_intrinsics_c.py --outdir prebuilt-intermediates/nir/ || ( prebuilt-intermediates/nir/nir_intrinsics.c; false) +python3 src/compiler/nir/nir_intrinsics_h.py --outdir prebuilt-intermediates/nir/ || ( prebuilt-intermediates/nir/nir_intrinsics.h; false) -python src/compiler/spirv/spirv_info_c.py src/compiler/spirv/spirv.core.grammar.json prebuilt-intermediates/spirv/spirv_info.c || ( prebuilt-intermediates/spirv/spirv_info.c; false) -python src/compiler/spirv/vtn_gather_types_c.py src/compiler/spirv/spirv.core.grammar.json prebuilt-intermediates/spirv/vtn_gather_types.c || ( prebuilt-intermediates/spirv/vtn_gather_types.c; false) -python src/compiler/spirv/vtn_generator_ids_h.py src/compiler/spirv/spir-v.xml prebuilt-intermediates/spirv/vtn_generator_ids.h +python3 src/compiler/spirv/spirv_info_c.py src/compiler/spirv/spirv.core.grammar.json prebuilt-intermediates/spirv/spirv_info.c || ( prebuilt-intermediates/spirv/spirv_info.c; false) +python3 src/compiler/spirv/vtn_gather_types_c.py src/compiler/spirv/spirv.core.grammar.json prebuilt-intermediates/spirv/vtn_gather_types.c || ( prebuilt-intermediates/spirv/vtn_gather_types.c; false) +python3 src/compiler/spirv/vtn_generator_ids_h.py src/compiler/spirv/spir-v.xml prebuilt-intermediates/spirv/vtn_generator_ids.h -python src/util/format_srgb.py > prebuilt-intermediates/util/format_srgb.c +python3 src/util/format_srgb.py > prebuilt-intermediates/util/format_srgb.c -python src/intel/genxml/gen_zipped_file.py src/broadcom/cle/v3d_packet_v21.xml src/broadcom/cle/v3d_packet_v33.xml > prebuilt-intermediates/cle/v3d_xml.h +python3 src/intel/genxml/gen_zipped_file.py src/broadcom/cle/v3d_packet_v21.xml src/broadcom/cle/v3d_packet_v33.xml > prebuilt-intermediates/cle/v3d_xml.h -python src/broadcom/cle/gen_pack_header.py src/broadcom/cle/v3d_packet_v21.xml 21 > prebuilt-intermediates/cle/v3d_packet_v21_pack.h -python src/broadcom/cle/gen_pack_header.py src/broadcom/cle/v3d_packet_v33.xml 33 > prebuilt-intermediates/cle/v3d_packet_v33_pack.h +python3 src/broadcom/cle/gen_pack_header.py src/broadcom/cle/v3d_packet_v21.xml 21 > prebuilt-intermediates/cle/v3d_packet_v21_pack.h +python3 src/broadcom/cle/gen_pack_header.py src/broadcom/cle/v3d_packet_v33.xml 33 > prebuilt-intermediates/cle/v3d_packet_v33_pack.h -python src/intel/isl/gen_format_layout.py --csv src/intel/isl/isl_format_layout.csv --out prebuilt-intermediates/isl/isl_format_layout.c +python3 src/intel/isl/gen_format_layout.py --csv src/intel/isl/isl_format_layout.csv --out prebuilt-intermediates/isl/isl_format_layout.c -python src/intel/genxml/gen_bits_header.py --cpp-guard=GENX_BITS_H \ +python3 src/intel/genxml/gen_bits_header.py --cpp-guard=GENX_BITS_H \ src/intel/genxml/gen4.xml \ src/intel/genxml/gen45.xml \ src/intel/genxml/gen5.xml \ @@ -46,7 +46,7 @@ python src/intel/genxml/gen_bits_header.py --cpp-guard=GENX_BITS_H \ src/intel/genxml/gen12.xml \ > prebuilt-intermediates/genxml/genX_bits.h -python src/intel/genxml/gen_zipped_file.py \ +python3 src/intel/genxml/gen_zipped_file.py \ src/intel/genxml/gen4.xml \ src/intel/genxml/gen45.xml \ src/intel/genxml/gen5.xml \ @@ -60,22 +60,22 @@ python src/intel/genxml/gen_zipped_file.py \ > prebuilt-intermediates/genxml/genX_xml.h -python src/intel/vulkan/anv_entrypoints_gen.py --outdir prebuilt-intermediates/vulkan/ --xml src/vulkan/registry/vk.xml -python src/intel/vulkan/anv_extensions_gen.py --xml src/vulkan/registry/vk.xml --out-c prebuilt-intermediates/vulkan/anv_extensions.c -python src/intel/vulkan/anv_extensions_gen.py --xml src/vulkan/registry/vk.xml --out-h prebuilt-intermediates/vulkan/anv_extensions.h -python src/vulkan/util/gen_enum_to_str.py --xml src/vulkan/registry/vk.xml --outdir prebuilt-intermediates/util/ +python3 src/intel/vulkan/anv_entrypoints_gen.py --outdir prebuilt-intermediates/vulkan/ --xml src/vulkan/registry/vk.xml +python3 src/intel/vulkan/anv_extensions_gen.py --xml src/vulkan/registry/vk.xml --out-c prebuilt-intermediates/vulkan/anv_extensions.c +python3 src/intel/vulkan/anv_extensions_gen.py --xml src/vulkan/registry/vk.xml --out-h prebuilt-intermediates/vulkan/anv_extensions.h +python3 src/vulkan/util/gen_enum_to_str.py --xml src/vulkan/registry/vk.xml --outdir prebuilt-intermediates/util/ -python src/gallium/drivers/lima/ir/lima_nir_algebraic.py -p src/compiler/nir/ > prebuilt-intermediates/lima/lima_nir_algebraic.c -python src/panfrost/midgard/midgard_nir_algebraic.py -p src/compiler/nir/ > prebuilt-intermediates/midgard/midgard_nir_algebraic.c +python3 src/gallium/drivers/lima/ir/lima_nir_algebraic.py -p src/compiler/nir/ > prebuilt-intermediates/lima/lima_nir_algebraic.c +python3 src/panfrost/midgard/midgard_nir_algebraic.py -p src/compiler/nir/ > prebuilt-intermediates/midgard/midgard_nir_algebraic.c python3 src/panfrost/bifrost/gen_disasm.py src/panfrost/bifrost/ISA.xml > prebuilt-intermediates/bifrost/bifrost_gen_disasm.c python3 src/panfrost/bifrost/bifrost_nir_algebraic.py -p src/compiler/nir/ > prebuilt-intermediates/bifrost/bifrost_nir_algebraic.c python3 src/panfrost/bifrost/gen_pack.py src/panfrost/bifrost/ISA.xml > prebuilt-intermediates/bifrost/bi_generated_pack.h -python src/intel/compiler/brw_nir_trig_workarounds.py -p src/compiler/nir > prebuilt-intermediates/compiler/brw_nir_trig_workarounds.c +python3 src/intel/compiler/brw_nir_trig_workarounds.py -p src/compiler/nir > prebuilt-intermediates/compiler/brw_nir_trig_workarounds.c -python src/intel/perf/gen_perf.py --code=prebuilt-intermediates/perf/gen_perf_metrics.c --header=prebuilt-intermediates/perf/gen_perf_metrics.h \ +python3 src/intel/perf/gen_perf.py --code=prebuilt-intermediates/perf/gen_perf_metrics.c --header=prebuilt-intermediates/perf/gen_perf_metrics.h \ src/intel/perf/oa-hsw.xml \ src/intel/perf/oa-bdw.xml \ src/intel/perf/oa-chv.xml \ diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk index c9a80ac65c9..916cbb38d4e 100644 --- a/src/amd/Android.common.mk +++ b/src/amd/Android.common.mk @@ -66,7 +66,7 @@ SID_TABLES_INPUTS := \ $(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) + $(hide) $(MESA_PYTHON3) $(SID_TABLES) $(SID_TABLES_INPUTS) > $@ || ($(RM) $@; false) AMDGFXREGS := $(LOCAL_PATH)/registers/makeregheader.py @@ -76,7 +76,7 @@ AMDGFXREGS_INPUTS := \ $(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) + $(hide) $(MESA_PYTHON3) $(AMDGFXREGS) $(AMDGFXREGS_INPUTS) --sort address --guard AMDGFXREGS_H > $@ || ($(RM) $@; false) GEN10_FORMAT_TABLE_INPUTS := \ $(MESA_TOP)/src/util/format/u_format.csv \ @@ -90,7 +90,7 @@ 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) + $(hide) $(MESA_PYTHON3) $(GEN10_FORMAT_TABLE) $(GEN10_FORMAT_TABLE_INPUTS) > $@ || ($(RM) $@; false) LOCAL_C_INCLUDES := \ $(MESA_TOP)/include \ diff --git a/src/amd/Android.compiler.mk b/src/amd/Android.compiler.mk index 9f14ffea75f..72e2af6366c 100644 --- a/src/amd/Android.compiler.mk +++ b/src/amd/Android.compiler.mk @@ -56,17 +56,17 @@ ACO_DEPS := $(MESA_TOP)/src/amd/compiler/aco_opcodes.py $(intermediates)/compiler/aco_opcodes.h: $(ACO_OPCODES_H_SCRIPT) $(ACO_DEPS) @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(ACO_OPCODES_H_SCRIPT) > $@ || ($(RM) $@; false) + $(hide) $(MESA_PYTHON3) $(ACO_OPCODES_H_SCRIPT) > $@ || ($(RM) $@; false) $(intermediates)/compiler/aco_opcodes.cpp: $(ACO_OPCODES_CPP_SCRIPT) $(ACO_DEPS) @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(ACO_OPCODES_CPP_SCRIPT) > $@ || ($(RM) $@; false) + $(hide) $(MESA_PYTHON3) $(ACO_OPCODES_CPP_SCRIPT) > $@ || ($(RM) $@; false) $(intermediates)/compiler/aco_builder.h: $(ACO_BUILDER_H_SCRIPT) $(ACO_DEPS) @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(ACO_BUILDER_H_SCRIPT) > $@ || ($(RM) $@; false) + $(hide) $(MESA_PYTHON3) $(ACO_BUILDER_H_SCRIPT) > $@ || ($(RM) $@; false) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/amd \ diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk index cfbe9b7acd1..59a30034d13 100644 --- a/src/amd/vulkan/Android.mk +++ b/src/amd/vulkan/Android.mk @@ -96,7 +96,7 @@ $(intermediates)/radv_entrypoints.c: $(RADV_ENTRYPOINTS_SCRIPT) \ $(RADV_EXTENSIONS_SCRIPT) \ $(vulkan_api_xml) @mkdir -p $(dir $@) - $(MESA_PYTHON2) $(RADV_ENTRYPOINTS_SCRIPT) \ + $(MESA_PYTHON3) $(RADV_ENTRYPOINTS_SCRIPT) \ --xml $(vulkan_api_xml) \ --outdir $(dir $@) @@ -104,7 +104,7 @@ $(intermediates)/radv_entrypoints.h: $(intermediates)/radv_entrypoints.c $(intermediates)/radv_extensions.c: $(RADV_EXTENSIONS_SCRIPT) $(vulkan_api_xml) @mkdir -p $(dir $@) - $(MESA_PYTHON2) $(RADV_EXTENSIONS_SCRIPT) \ + $(MESA_PYTHON3) $(RADV_EXTENSIONS_SCRIPT) \ --xml $(vulkan_api_xml) \ --out-c $@ \ --out-h $(addsuffix .h,$(basename $@)) @@ -115,7 +115,7 @@ $(intermediates)/vk_format_table.c: $(VK_FORMAT_TABLE_SCRIPT) \ $(VK_FORMAT_PARSE_SCRIPT) \ $(vk_format_layout_csv) @mkdir -p $(dir $@) - $(MESA_PYTHON2) $(VK_FORMAT_TABLE_SCRIPT) $(vk_format_layout_csv) > $@ + $(MESA_PYTHON3) $(VK_FORMAT_TABLE_SCRIPT) $(vk_format_layout_csv) > $@ LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES) diff --git a/src/broadcom/Android.genxml.mk b/src/broadcom/Android.genxml.mk index d14ccfb82cd..6b5b3d99495 100644 --- a/src/broadcom/Android.genxml.mk +++ b/src/broadcom/Android.genxml.mk @@ -58,13 +58,13 @@ $(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: $(prebuilt_intermediates)/c @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" @cp -f $< $@ -$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py +$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/cle/gen_pack_header.py $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_VER := 41 $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py $(call pack-header-gen) -$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py +$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/cle/gen_pack_header.py $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_VER := 42 $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk index 2d68a195c0d..848a2d2e2cd 100644 --- a/src/compiler/Android.glsl.gen.mk +++ b/src/compiler/Android.glsl.gen.mk @@ -84,4 +84,4 @@ $(intermediates)/glsl/ir_expression_operation_strings.h: $(prebuilt_intermediate $(intermediates)/glsl/float64_glsl.h: $(MESA_TOP)/src/util/xxd.py @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< $(MESA_TOP)/src/compiler/glsl/float64.glsl $@ -n float64_source > $@ + $(hide) $(MESA_PYTHON3) $< $(MESA_TOP)/src/compiler/glsl/float64.glsl $@ -n float64_source > $@ diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index 497a2a069f8..670e1454aa4 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -69,7 +69,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES intermediates := $(call local-generated-sources-dir) LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(GENERATED_SOURCES)) -$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2) +$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON3) $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@ $(intermediates)/indices/u_indices_gen.c \ diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index b47b46e82a3..727cd754767 100644 --- a/src/gallium/drivers/r600/Android.mk +++ b/src/gallium/drivers/r600/Android.mk @@ -50,7 +50,7 @@ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(R600_GENERATED_FILES $(intermediates)/egd_tables.h: $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" - $(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h > $@ + $(hide) $(MESA_PYTHON3) $(MESA_TOP)/src/gallium/drivers/r600/egd_tables.py $(MESA_TOP)/src/gallium/drivers/r600/evergreend.h > $@ ifeq ($(MESA_ENABLE_LLVM),true) $(call mesa-build-with-llvm) diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk index 92c6233cc66..b741a9aafb9 100644 --- a/src/intel/Android.genxml.mk +++ b/src/intel/Android.genxml.mk @@ -57,52 +57,52 @@ $(intermediates)/genxml/genX_bits.h: $(prebuilt_intermediates)/genxml/genX_bits. @mkdir -p $(dir $@) @cp -f $< $@ -$(intermediates)/genxml/gen4_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen4_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen4_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen4.xml $(intermediates)/genxml/gen4_pack.h: $(LOCAL_PATH)/genxml/gen4.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen45_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen45_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen45_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen45.xml $(intermediates)/genxml/gen45_pack.h: $(LOCAL_PATH)/genxml/gen45.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen5_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen5_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen5_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen5.xml $(intermediates)/genxml/gen5_pack.h: $(LOCAL_PATH)/genxml/gen5.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen6_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen6_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen6_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen6.xml $(intermediates)/genxml/gen6_pack.h: $(LOCAL_PATH)/genxml/gen6.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen7_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen7_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen7_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen7.xml $(intermediates)/genxml/gen7_pack.h: $(LOCAL_PATH)/genxml/gen7.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen75_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen75_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen75_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen75.xml $(intermediates)/genxml/gen75_pack.h: $(LOCAL_PATH)/genxml/gen75.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen8_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen8_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen8_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen8.xml $(intermediates)/genxml/gen8_pack.h: $(LOCAL_PATH)/genxml/gen8.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen9_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen9_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen9_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen9.xml $(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/genxml/gen9.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen11_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen11_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen11_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen11.xml $(intermediates)/genxml/gen11_pack.h: $(LOCAL_PATH)/genxml/gen11.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) -$(intermediates)/genxml/gen12_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py +$(intermediates)/genxml/gen12_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/genxml/gen_pack_header.py $(intermediates)/genxml/gen12_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen12.xml $(intermediates)/genxml/gen12_pack.h: $(LOCAL_PATH)/genxml/gen12.xml $(LOCAL_PATH)/genxml/gen_pack_header.py $(call header-gen) diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk index caadde16812..b26ad0a160d 100644 --- a/src/mapi/Android.mk +++ b/src/mapi/Android.mk @@ -76,7 +76,7 @@ mapi_abi_deps := \ $(wildcard $(LOCAL_PATH)/glapi/gen/*.xml) \ $(LOCAL_PATH)/mapi_abi.py -$(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi_abi.py +$(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/mapi_abi.py $(mapi_abi_headers): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml $(mapi_abi_headers): $(mapi_abi_deps) @mkdir -p $(dir $@) diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk index a7dd831b472..6340e1065b1 100644 --- a/src/mesa/Android.gen.mk +++ b/src/mesa/Android.gen.mk @@ -79,79 +79,79 @@ $(intermediates)/x86/matypes.h: $(prebuilt_intermediates)/x86/matypes.h @mkdir -p $(dir $@) cp -a $< $@ -$(intermediates)/main/dispatch.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_table.py +$(intermediates)/main/dispatch.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(glapi)/gl_table.py $(intermediates)/main/dispatch.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml $(intermediates)/main/dispatch.h: $(dispatch_deps) $(call es-gen, $* -m remap_table) -$(intermediates)/main/remap_helper.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/remap_helper.py +$(intermediates)/main/remap_helper.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(glapi)/remap_helper.py $(intermediates)/main/remap_helper.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml $(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_SCRIPT :=$(MESA_PYTHON3) $(glapi)/gl_enums.py $(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/../registry/gl.xml $(intermediates)/main/enums.c: $(dispatch_deps) $(call es-gen) -$(intermediates)/main/api_exec.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_genexec.py +$(intermediates)/main/api_exec.c: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(glapi)/gl_genexec.py $(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_SCRIPT := $(MESA_PYTHON3) $(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_SCRIPT := $(MESA_PYTHON3) $(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_SCRIPT := $(MESA_PYTHON3) $(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_SCRIPT := $(MESA_PYTHON3) $(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_SCRIPT := $(MESA_PYTHON3) $(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_SCRIPT := $(MESA_PYTHON3) $(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_SCRIPT := $(MESA_PYTHON3) $(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_SCRIPT := $(MESA_PYTHON3) $(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_SCRIPT := $(MESA_PYTHON3) $(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) @@ -159,7 +159,7 @@ $(intermediates)/main/marshal_generated.h: $(dispatch_deps) GET_HASH_GEN := $(LOCAL_PATH)/main/get_hash_generator.py -$(intermediates)/main/get_hash.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(GET_HASH_GEN) +$(intermediates)/main/get_hash.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(GET_HASH_GEN) $(intermediates)/main/get_hash.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml $(intermediates)/main/get_hash.h: $(glapi)/gl_and_es_API.xml \ $(LOCAL_PATH)/main/get_hash_params.py $(GET_HASH_GEN) @@ -174,7 +174,7 @@ format_info_deps := \ $(LOCAL_PATH)/main/format_parser.py \ $(FORMAT_INFO) -$(intermediates)/main/format_info.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(FORMAT_INFO) +$(intermediates)/main/format_info.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(FORMAT_INFO) $(intermediates)/main/format_info.h: PRIVATE_XML := $(intermediates)/main/format_info.h: $(format_info_deps) $(call es-gen, $<) @@ -184,5 +184,3 @@ $(intermediates)/main/format_pack.c: $(prebuilt_intermediates)/main/format_pack. $(intermediates)/main/format_unpack.c: $(prebuilt_intermediates)/main/format_unpack.c cp -a $< $@ - - diff --git a/src/mesa/Android.libmesa_git_sha1.mk b/src/mesa/Android.libmesa_git_sha1.mk index 42994baf9d6..e915c770ca0 100644 --- a/src/mesa/Android.libmesa_git_sha1.mk +++ b/src/mesa/Android.libmesa_git_sha1.mk @@ -47,7 +47,7 @@ $(intermediates)/dummy.c: LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, git_sha1.h) .KATI_RESTAT: $(intermediates)/git_sha1.h -$(intermediates)/git_sha1.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(MESA_TOP)/bin/git_sha1_gen.py +$(intermediates)/git_sha1.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(MESA_TOP)/bin/git_sha1_gen.py $(intermediates)/git_sha1.h: $(wildcard $(MESA_TOP)/.git/logs/HEAD) $(MESA_TOP)/bin/git_sha1_gen.py @mkdir -p $(dir $@) @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 90b274f30e8..4259e470766 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -326,7 +326,7 @@ $(intermediates)/brw_oa_metrics.c: .KATI_IMPLICIT_OUTPUTS := $(intermediates)/br $(intermediates)/brw_oa_metrics.c: $(LOCAL_PATH)/brw_oa.py $(i965_oa_xml_FILES) @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $< \ + $(hide) $(MESA_PYTHON3) $< \ --code=$@ \ --header=$(call generated-sources-dir-for,SHARED_LIBRARIES,i965_dri,,)/brw_oa_metrics.h \ $(i965_oa_xml_FILES) diff --git a/src/util/Android.mk b/src/util/Android.mk index 8f4eae083b8..438f926a110 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -75,7 +75,7 @@ format_srgb_gen := $(LOCAL_PATH)/format_srgb.py $(intermediates)/format_srgb.c: $(format_srgb_gen) @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(format_srgb_gen) $< > $@ + $(hide) $(MESA_PYTHON3) $(format_srgb_gen) $< > $@ u_format_gen := $(LOCAL_PATH)/format/u_format_table.py u_format_deps := $(LOCAL_PATH)/format/u_format.csv \ @@ -84,11 +84,11 @@ u_format_deps := $(LOCAL_PATH)/format/u_format.csv \ $(intermediates)/format/u_format_pack.h: $(u_format_deps) @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(u_format_gen) --header $< > $@ + $(hide) $(MESA_PYTHON3) $(u_format_gen) --header $< > $@ $(intermediates)/format/u_format_table.c: $(u_format_deps) @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(u_format_gen) $< > $@ + $(hide) $(MESA_PYTHON3) $(u_format_gen) $< > $@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3