st/mesa: use new cso_save/restore_state() functions

[mesa.git] / src / mesa / Android.gen.mk

diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk
index 35f00da09d3bec68dc13fedf134bdc5f2c1bade8..a985f0a64b15f1ed9c2af5b149c60ce4ac284962 100644 (file)
--- a/src/mesa/Android.gen.mk
+++ b/src/mesa/Android.gen.mk
@@ -27,13 +27,16 @@ ifeq ($(LOCAL_MODULE_CLASS),)
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 endif
 
-intermediates := $(call local-intermediates-dir)
+intermediates := $(call local-generated-sources-dir)
 
 # This is the list of auto-generated files: sources and headers
 sources := \
        main/enums.c \
        main/api_exec.c \
        main/dispatch.h \
+       main/format_pack.c \
+       main/format_unpack.c \
+       main/format_info.h \
        main/remap_helper.h \
        main/get_hash.h
 
@@ -99,7 +102,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)
@@ -111,8 +114,42 @@ $(intermediates)/main/api_exec.c: $(dispatch_deps)
        $(call es-gen)
 
 GET_HASH_GEN := $(LOCAL_PATH)/main/get_hash_generator.py
-GET_HASH_GEN_FLAGS := $(patsubst %,-a %,$(MESA_ENABLED_APIS))
 
+$(intermediates)/main/get_hash.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(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)
-       @$(MESA_PYTHON2) $(GET_HASH_GEN) $(GET_HASH_GEN_FLAGS) -f $< > $@
+       $(call es-gen)
+
+FORMAT_INFO := $(LOCAL_PATH)/main/format_info.py
+format_info_deps := \
+       $(LOCAL_PATH)/main/formats.csv \
+       $(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_XML :=
+$(intermediates)/main/format_info.h: $(format_info_deps)
+       $(call es-gen, $<)
+
+FORMAT_PACK := $(LOCAL_PATH)/main/format_pack.py
+format_pack_deps := \
+       $(LOCAL_PATH)/main/formats.csv \
+       $(LOCAL_PATH)/main/format_parser.py \
+       $(FORMAT_PACK)
+
+$(intermediates)/main/format_pack.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(FORMAT_PACK)
+$(intermediates)/main/format_pack.c: PRIVATE_XML :=
+$(intermediates)/main/format_pack.c: $(format_pack_deps)
+       $(call es-gen, $<)
+
+FORMAT_UNPACK := $(LOCAL_PATH)/main/format_unpack.py
+format_unpack_deps := \
+       $(LOCAL_PATH)/main/formats.csv \
+       $(LOCAL_PATH)/main/format_parser.py \
+       $(FORMAT_UNPACK)
+
+$(intermediates)/main/format_unpack.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(FORMAT_UNPACK)
+$(intermediates)/main/format_unpack.c: PRIVATE_XML :=
+$(intermediates)/main/format_unpack.c: $(format_unpack_deps)
+       $(call es-gen, $<)