From: Adrian Negreanu Date: Fri, 13 Sep 2013 08:58:33 +0000 (+0300) Subject: android: Remove builtin_compiler X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=602d368446e7c97225f98429ffd54b53522c3b36;p=mesa.git android: Remove builtin_compiler The first part was done in: commit c845140a20efa6a30a5465301d1f9b4acea79155 Author: Kenneth Graunke Date: Tue Sep 3 21:22:17 2013 -0700 Signed-off-by: Adrian Negreanu Acked-by: Ian Romanick Reviewed-by: Chad Versace --- diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk index 2ed9fa64bac..7ec56d4f203 100644 --- a/src/glsl/Android.gen.mk +++ b/src/glsl/Android.gen.mk @@ -35,10 +35,6 @@ sources := \ glcpp/glcpp-lex.c \ glcpp/glcpp-parse.c -ifneq ($(LOCAL_IS_HOST_MODULE),true) -sources += builtin_function.cpp -endif - LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES)) LOCAL_C_INCLUDES += $(intermediates) $(intermediates)/glcpp $(MESA_TOP)/src/glsl/glcpp @@ -81,18 +77,3 @@ $(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) - -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/*) - -$(intermediates)/builtin_function.cpp: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/builtins/tools/generate_builtins.py -$(intermediates)/builtin_function.cpp: $(builtin_function_deps) - @mkdir -p $(dir $@) - @echo "Gen GLSL: $(PRIVATE_MODULE) <= $(notdir $@)" - $(hide) $(PRIVATE_SCRIPT) $(BUILTIN_COMPILER) > $@ || rm -f $@