Import Mesa 20.1.6

2 files changed, 5 insertions, 110 deletions

diff --git a/lib/mesa/src/panfrost/Android.bifrost.mk b/lib/mesa/src/panfrost/Android.bifrost.mk
index 89caa17f5..3c77cb4da 100644
--- a/lib/mesa/src/panfrost/Android.bifrost.mk
+++ b/lib/mesa/src/panfrost/Android.bifrost.mk
@@ -18,44 +18,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-# build libpanfrost_bifrost_disasm
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libpanfrost_bifrost_disasm
-
-LOCAL_SRC_FILES := \
-	$(bifrost_disasm_FILES)
-
-LOCAL_C_INCLUDES := \
-	$(MESA_TOP)/include \
-	$(MESA_TOP)/src/compiler/nir/ \
-	$(MESA_TOP)/src/gallium/auxiliary/ \
-	$(MESA_TOP)/src/gallium/include/ \
-	$(MESA_TOP)/src/mapi/ \
-	$(MESA_TOP)/src/mesa/ \
-	$(MESA_TOP)/src/panfrost/bifrost/ \
-	$(MESA_TOP)/src/panfrost/include/
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-	$(MESA_TOP)/src/panfrost/bifrost/ \
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-intermediates := $(call local-generated-sources-dir)
-
-LOCAL_GENERATED_SOURCES := \
-	$(intermediates)/bifrost_gen_disasm.c
-
-bifrost_gen_disasm_gen := $(LOCAL_PATH)/bifrost/gen_disasm.py
-bifrost_gen_disasm_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py
-
-$(intermediates)/bifrost_gen_disasm.c: $(bifrost_gen_disasm_deps)
-	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON3) $(bifrost_gen_disasm_gen) $< > $@
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# build libpanfrost_bifrost
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libpanfrost_bifrost
@@ -78,16 +40,10 @@ LOCAL_C_INCLUDES := \
 LOCAL_STATIC_LIBRARIES := \
 	libmesa_glsl \
 	libmesa_nir \
-	libmesa_st_mesa \
-	libpanfrost_lib
+	libmesa_st_mesa
 
 LOCAL_GENERATED_SOURCES := \
 	$(intermediates)/bifrost_nir_algebraic.c \
-	$(intermediates)/bi_builder.h \
-	$(intermediates)/bi_opcodes.c \
-	$(intermediates)/bi_opcodes.h \
-	$(intermediates)/bi_packer.c \
-	$(intermediates)/bi_printer.c \
 	$(MESA_GEN_GLSL_H)
 
 bifrost_nir_algebraic_gen := $(LOCAL_PATH)/bifrost/bifrost_nir_algebraic.py
@@ -96,45 +52,10 @@ bifrost_nir_algebraic_deps := \
 
 $(intermediates)/bifrost_nir_algebraic.c: $(bifrost_nir_algebraic_deps)
 	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON3) $(bifrost_nir_algebraic_gen) -p $< > $@
-
-bi_builder_h_gen := $(LOCAL_PATH)/bifrost/bi_builder.h.py
-bi_builder_h_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py
-
-$(intermediates)/bi_builder.h: $(bi_builder_h_deps)
-	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON3) $(bi_builder_h_gen) $< > $@
-
-bi_opcodes_c_gen := $(LOCAL_PATH)/bifrost/bi_opcodes.c.py
-bi_opcodes_c_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py
-
-$(intermediates)/bi_opcodes.c: $(bi_opcodes_c_deps)
-	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON3) $(bi_opcodes_c_gen) $< > $@
-
-bi_opcodes_h_gen := $(LOCAL_PATH)/bifrost/bi_opcodes.h.py
-bi_opcodes_h_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py
-
-$(intermediates)/bi_opcodes.h: $(bi_opcodes_h_deps)
-	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON3) $(bi_opcodes_h_gen) $< > $@
-
-bi_packer_c_gen := $(LOCAL_PATH)/bifrost/bi_packer.c.py
-bi_packer_c_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py
-
-$(intermediates)/bi_packer.c: $(bi_packer_c_deps)
-	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON3) $(bi_packer_c_gen) $< > $@
-
-bi_printer_c_gen := $(LOCAL_PATH)/bifrost/bi_printer.c.py
-bi_printer_c_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py
-
-$(intermediates)/bi_printer.c: $(bi_printer_c_deps)
-	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON3) $(bi_printer_c_gen) $< > $@
+	$(hide) $(MESA_PYTHON2) $(bifrost_nir_algebraic_gen) -p $< > $@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(MESA_TOP)/src/panfrost/bifrost/ \
 
 include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
diff --git a/lib/mesa/src/panfrost/Android.midgard.mk b/lib/mesa/src/panfrost/Android.midgard.mk
index a5c1040ff..1b3932a87 100644
--- a/lib/mesa/src/panfrost/Android.midgard.mk
+++ b/lib/mesa/src/panfrost/Android.midgard.mk
@@ -18,31 +18,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-# build libpanfrost_midgard_disasm
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libpanfrost_midgard_disasm
-
-LOCAL_SRC_FILES := \
-	$(midgard_disasm_FILES)
-
-LOCAL_C_INCLUDES := \
-	$(MESA_TOP)/include \
-	$(MESA_TOP)/src/compiler/nir/ \
-	$(MESA_TOP)/src/gallium/auxiliary/ \
-	$(MESA_TOP)/src/gallium/include/ \
-	$(MESA_TOP)/src/mapi/ \
-	$(MESA_TOP)/src/mesa/ \
-	$(MESA_TOP)/src/panfrost/include/ \
-	$(MESA_TOP)/src/panfrost/midgard/
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-	$(MESA_TOP)/src/panfrost/midgard/ \
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# build libpanfrost_midgard
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libpanfrost_midgard
@@ -71,7 +46,6 @@ LOCAL_STATIC_LIBRARIES := \
 	libmesa_nir \
 	libmesa_st_mesa \
 	libpanfrost_util \
-	libpanfrost_midgard_disasm
 
 midgard_nir_algebraic_gen := $(LOCAL_PATH)/midgard/midgard_nir_algebraic.py
 midgard_nir_algebraic_deps := \
@@ -79,10 +53,10 @@ midgard_nir_algebraic_deps := \
 
 $(intermediates)/midgard_nir_algebraic.c: $(midgard_nir_algebraic_deps)
 	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON3) $(midgard_nir_algebraic_gen) -p $< > $@
+	$(hide) $(MESA_PYTHON2) $(midgard_nir_algebraic_gen) -p $< > $@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(MESA_TOP)/src/panfrost/midgard/ \
 
 include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file