nir/glsl_to_nir: ignore an instruction's dest if it hasn't any

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

diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk
index 2ed9fa64bac99144f850f7d9ef65bd74b1704c53..6898fb0d4921683db39775ae36bf9f44d18cd16b 100644 (file)
--- a/src/glsl/Android.gen.mk
+++ b/src/glsl/Android.gen.mk
@@ -27,24 +27,23 @@ ifeq ($(LOCAL_MODULE_CLASS),)
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 endif
 
-intermediates := $(call local-intermediates-dir)
+intermediates := $(call local-generated-sources-dir)
 
-sources := \
-       glsl_lexer.cpp \
-       glsl_parser.cpp \
-       glcpp/glcpp-lex.c \
-       glcpp/glcpp-parse.c
+LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
 
-ifneq ($(LOCAL_IS_HOST_MODULE),true)
-sources += builtin_function.cpp
-endif
-
-LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES))
+LOCAL_C_INCLUDES += \
+       $(intermediates)/glcpp \
+       $(intermediates)/nir \
+       $(MESA_TOP)/src/glsl/glcpp \
+       $(MESA_TOP)/src/glsl/nir
 
-LOCAL_C_INCLUDES += $(intermediates) $(intermediates)/glcpp $(MESA_TOP)/src/glsl/glcpp
+LOCAL_EXPORT_C_INCLUDE_DIRS += \
+       $(intermediates)/nir
 
-sources := $(addprefix $(intermediates)/, $(sources))
-LOCAL_GENERATED_SOURCES += $(sources)
+LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
+       $(LIBGLCPP_GENERATED_FILES) \
+       $(NIR_GENERATED_FILES) \
+       $(LIBGLSL_GENERATED_CXX_FILES))
 
 define local-l-or-ll-to-c-or-cpp
        @mkdir -p $(dir $@)
@@ -82,17 +81,49 @@ $(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l
 $(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y
        $(call glsl_local-y-to-c-and-h)
 
-BUILTIN_COMPILER := $(BUILD_OUT_EXECUTABLES)/mesa_builtin_compiler$(BUILD_EXECUTABLE_SUFFIX)
+nir_builder_opcodes_gen := $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py
+nir_builder_opcodes_deps := \
+       $(LOCAL_PATH)/nir/nir_opcodes.py \
+       $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py
+
+$(intermediates)/nir/nir_builder_opcodes.h: $(nir_builder_opcodes_deps)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $(nir_builder_opcodes_gen) $< > $@
+
+nir_constant_expressions_gen := $(LOCAL_PATH)/nir/nir_constant_expressions.py
+nir_constant_expressions_deps := \
+       $(LOCAL_PATH)/nir/nir_opcodes.py \
+       $(LOCAL_PATH)/nir/nir_constant_expressions.py
+
+$(intermediates)/nir/nir_constant_expressions.c: $(nir_constant_expressions_deps)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $(nir_constant_expressions_gen) $< > $@
+
+nir_opcodes_h_gen := $(LOCAL_PATH)/nir/nir_opcodes_h.py
+nir_opcodes_h_deps := \
+       $(LOCAL_PATH)/nir/nir_opcodes.py \
+       $(LOCAL_PATH)/nir/nir_opcodes_h.py
+
+$(intermediates)/nir/nir_opcodes.h: $(nir_opcodes_h_deps)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $(nir_opcodes_h_gen) $< > $@
+
+$(LOCAL_PATH)/nir/nir.h: $(intermediates)/nir/nir_opcodes.h
+
+nir_opcodes_c_gen := $(LOCAL_PATH)/nir/nir_opcodes_c.py
+nir_opcodes_c_deps := \
+       $(LOCAL_PATH)/nir/nir_opcodes.py \
+       $(LOCAL_PATH)/nir/nir_opcodes_c.py
+
+$(intermediates)/nir/nir_opcodes.c: $(nir_opcodes_c_deps)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $(nir_opcodes_c_gen) $< > $@
 
-builtin_function_deps := \
-       $(LOCAL_PATH)/builtins/tools/generate_builtins.py \
-       $(LOCAL_PATH)/builtins/tools/texture_builtins.py \
-       $(BUILTIN_COMPILER) \
-       $(wildcard $(LOCAL_PATH)/builtins/profiles/*) \
-               $(wildcard $(LOCAL_PATH)/builtins/ir/*)
+nir_opt_algebraic_gen := $(LOCAL_PATH)/nir/nir_opt_algebraic.py
+nir_opt_algebraic_deps := \
+       $(LOCAL_PATH)/nir/nir_opt_algebraic.py \
+       $(LOCAL_PATH)/nir/nir_algebraic.py
 
-$(intermediates)/builtin_function.cpp: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/builtins/tools/generate_builtins.py
-$(intermediates)/builtin_function.cpp: $(builtin_function_deps)
+$(intermediates)/nir/nir_opt_algebraic.c: $(nir_opt_algebraic_deps)
        @mkdir -p $(dir $@)
-       @echo "Gen GLSL: $(PRIVATE_MODULE) <= $(notdir $@)"
-       $(hide) $(PRIVATE_SCRIPT) $(BUILTIN_COMPILER) > $@ || rm -f $@
+       $(hide) $(MESA_PYTHON2) $(nir_opt_algebraic_gen) $< > $@