diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-01-22 02:13:10 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-01-22 02:13:10 +0000 |
| commit | 2ebab484cac65c01dd19e8c1b62eb58c83074390 (patch) | |
| tree | d5decbcdfb7743214078cb8e0b0372a59c2ca6d6 /lib/mesa/src/compiler | |
| parent | c5f75a531a75824f9087ebabbb1d9ff34a17d110 (diff) | |
Import Mesa 19.2.8
Diffstat (limited to 'lib/mesa/src/compiler')
| -rw-r--r-- | lib/mesa/src/compiler/Android.glsl.gen.mk | 4 | ||||
| -rw-r--r-- | lib/mesa/src/compiler/Android.nir.gen.mk | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/lib/mesa/src/compiler/Android.glsl.gen.mk b/lib/mesa/src/compiler/Android.glsl.gen.mk index f654c869f..1308de2db 100644 --- a/lib/mesa/src/compiler/Android.glsl.gen.mk +++ b/lib/mesa/src/compiler/Android.glsl.gen.mk @@ -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) <= $<" - $(hide) $(MESA_LEX) --nounistd -o$@ $< + $(hide) $(LEX) --nounistd -o$@ $< endef define glsl_local-y-to-c-and-h @@ -102,6 +102,6 @@ $(intermediates)/glsl/ir_expression_operation_strings.h: $(LOCAL_PATH)/glsl/ir_e @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $< strings > $@ -$(intermediates)/glsl/float64_glsl.h: $(MESA_TOP)/src/util/xxd.py +$(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 > $@ diff --git a/lib/mesa/src/compiler/Android.nir.gen.mk b/lib/mesa/src/compiler/Android.nir.gen.mk index ad640dd04..e753bb77a 100644 --- a/lib/mesa/src/compiler/Android.nir.gen.mk +++ b/lib/mesa/src/compiler/Android.nir.gen.mk @@ -33,7 +33,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) LOCAL_C_INCLUDES += \ $(intermediates)/nir \ - $(intermediates)/spirv \ $(MESA_TOP)/src/compiler/nir LOCAL_EXPORT_C_INCLUDE_DIRS += \ @@ -100,11 +99,7 @@ $(intermediates)/spirv/spirv_info.c: $(LOCAL_PATH)/spirv/spirv_info_c.py $(LOCAL @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) -$(intermediates)/spirv/vtn_gather_types.c: $(LOCAL_PATH)/spirv/vtn_gather_types_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) - -$(intermediates)/spirv/vtn_generator_ids.h: $(LOCAL_PATH)/spirv/vtn_generator_ids_h.py $(LOCAL_PATH)/spirv/spir-v.xml +$(intermediates)/spirv/vtn_gather_types.c:: $(LOCAL_PATH)/spirv/vtn_gather_types_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) @@ -117,8 +112,3 @@ nir_intrinsics_c_gen := $(LOCAL_PATH)/nir/nir_intrinsics_c.py $(intermediates)/nir/nir_intrinsics.c: $(LOCAL_PATH)/nir/nir_intrinsics.py $(nir_intrinsics_c_gen) @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $(nir_intrinsics_c_gen) --outdir $(dir $@) || ($(RM) $@; false) - -nir_intrinsics_indices_h_gen := $(LOCAL_PATH)/nir/nir_intrinsics_indices_h.py -$(intermediates)/nir/nir_intrinsics_indices.h: $(LOCAL_PATH)/nir/nir_intrinsics.py $(nir_intrinsics_indices_h_gen) - @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(nir_intrinsics_indices_h_gen) --outdir $(dir $@) || ($(RM) $@; false) |