Added few more stubs so that control reaches to DestroyDevice().

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

diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
index d7623e5781d8a890812aec00ed6f302b66186f4a..a32c4ca6a500b205466a285fea7997b57860c0fc 100644 (file)
--- a/src/compiler/Android.glsl.gen.mk
+++ b/src/compiler/Android.glsl.gen.mk
@@ -35,14 +35,14 @@ LOCAL_C_INCLUDES += \
        $(intermediates)/glsl \
        $(intermediates)/glsl/glcpp \
        $(LOCAL_PATH)/glsl \
        $(intermediates)/glsl \
        $(intermediates)/glsl/glcpp \
        $(LOCAL_PATH)/glsl \

-       $(LOCAL_PATH)/glsl/glcpp \
+       $(LOCAL_PATH)/glsl/glcpp

 
 LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
        $(LIBGLCPP_GENERATED_FILES) \
        $(LIBGLSL_GENERATED_FILES))
 
 LOCAL_EXPORT_C_INCLUDE_DIRS += \
 
 LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
        $(LIBGLCPP_GENERATED_FILES) \
        $(LIBGLSL_GENERATED_FILES))
 
 LOCAL_EXPORT_C_INCLUDE_DIRS += \

-       $(intermediates)/glsl \
+       $(intermediates)/glsl

 
 # Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this
 MESA_GEN_GLSL_H := $(addprefix $(call local-generated-sources-dir)/, \
 
 # Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this
 MESA_GEN_GLSL_H := $(addprefix $(call local-generated-sources-dir)/, \


@@ -53,7 +53,7 @@ MESA_GEN_GLSL_H := $(addprefix $(call local-generated-sources-dir)/, \
 define local-l-or-ll-to-c-or-cpp
        @mkdir -p $(dir $@)
        @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<"
 define local-l-or-ll-to-c-or-cpp
        @mkdir -p $(dir $@)
        @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<"

-       $(hide) $(LEX) --nounistd -o$@ $<
+       $(hide) $(MESA_LEX) --nounistd -o$@ $<

 endef
 
 define glsl_local-y-to-c-and-h
 endef
 
 define glsl_local-y-to-c-and-h


@@ -90,8 +90,6 @@ $(intermediates)/glsl/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-lex.l
 $(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y
        $(call glsl_local-y-to-c-and-h)
 
 $(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y
        $(call glsl_local-y-to-c-and-h)
 

-$(LOCAL_PATH)/glsl/ir.h: $(intermediates)/glsl/ir_expression_operation.h
-

 $(intermediates)/glsl/ir_expression_operation.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py
        @mkdir -p $(dir $@)
        $(hide) $(MESA_PYTHON2) $< enum > $@
 $(intermediates)/glsl/ir_expression_operation.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py
        @mkdir -p $(dir $@)
        $(hide) $(MESA_PYTHON2) $< enum > $@


@@ -103,3 +101,7 @@ $(intermediates)/glsl/ir_expression_operation_constant.h: $(LOCAL_PATH)/glsl/ir_
 $(intermediates)/glsl/ir_expression_operation_strings.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py
        @mkdir -p $(dir $@)
        $(hide) $(MESA_PYTHON2) $< strings > $@
 $(intermediates)/glsl/ir_expression_operation_strings.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py
        @mkdir -p $(dir $@)
        $(hide) $(MESA_PYTHON2) $< strings > $@

+
+$(intermediates)/glsl/float64_glsl.h: $(LOCAL_PATH)/glsl/xxd.py
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $< $(MESA_TOP)/src/compiler/glsl/float64.glsl $@ -n float64_source > $@