summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Negreanu <[email protected]>2013-09-13 11:58:33 +0300
committerChad Versace <[email protected]>2013-09-18 09:35:55 -0700
commit602d368446e7c97225f98429ffd54b53522c3b36 (patch)
treedb7f3d9ab7544410234672086c63d5410a388150
parente150c0da7178e5aacd54e73af09b1de5fe1bf903 (diff)
android: Remove builtin_compiler
The first part was done in: commit c845140a20efa6a30a5465301d1f9b4acea79155 Author: Kenneth Graunke <[email protected]> Date: Tue Sep 3 21:22:17 2013 -0700 Signed-off-by: Adrian Negreanu <[email protected]> Acked-by: Ian Romanick <[email protected]> Reviewed-by: Chad Versace <[email protected]>
-rw-r--r--src/glsl/Android.gen.mk19
1 files changed, 0 insertions, 19 deletions
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 $@