From 832e259a036651dd37ffca08072d7e8f17ea1fba Mon Sep 17 00:00:00 2001 From: Joshua Groves Date: Sun, 7 Feb 2021 19:41:35 -0330 Subject: [PATCH] Ues updated paths in Makefile --- Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index f5d6b08b41..294ab4f1ed 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,14 @@ .PHONY: all clean validate-spv validate-msl .SECONDARY: boids.metal quad.metal -SNAPSHOTS=tests/snapshots +SNAPSHOTS_IN=tests/in +SNAPSHOTS_OUT=tests/out all: clean: rm *.metal *.air *.metallib *.vert *.frag *.comp *.spv -%.metal: $(SNAPSHOTS)/in/%.wgsl $(wildcard src/*.rs src/**/*.rs examples/*.rs) +%.metal: $(SNAPSHOTS_IN)/%.wgsl $(wildcard src/*.rs src/**/*.rs examples/*.rs) cargo run --example convert --features wgsl-in,msl-out -- $< $@ %.air: %.metal @@ -24,28 +25,28 @@ clean: cargo run --example convert --features wgsl-in,glsl-out -- $< $@ glslangValidator $@ -validate-spv: $(SNAPSHOTS)/*.spvasm.snap +validate-spv: $(SNAPSHOTS_OUT)/*.spvasm.snap @for file in $^ ; do \ - echo "Validating" $${file#"$(SNAPSHOTS)/snapshots__"}; \ + echo "Validating" $${file#"$(SNAPSHOTS_OUT)/snapshots__"}; \ tail -n +5 $${file} | spirv-as --target-env vulkan1.0 -o - | spirv-val; \ done -validate-msl: $(SNAPSHOTS)/*.msl.snap +validate-msl: $(SNAPSHOTS_OUT)/*.msl.snap @for file in $^ ; do \ - echo "Validating" $${file#"$(SNAPSHOTS)/snapshots__"}; \ + echo "Validating" $${file#"$(SNAPSHOTS_OUT)/snapshots__"}; \ tail -n +5 $${file} | xcrun -sdk macosx metal -mmacosx-version-min=10.11 -x metal - -o /dev/null; \ done -validate-glsl: $(SNAPSHOTS)/*.glsl.snap - @for file in $(SNAPSHOTS)/*-Vertex.glsl.snap ; do \ - echo "Validating" $${file#"$(SNAPSHOTS)/snapshots__"};\ +validate-glsl: $(SNAPSHOTS_OUT)/*.glsl.snap + @for file in $(SNAPSHOTS_OUT)/*-Vertex.glsl.snap ; do \ + echo "Validating" $${file#"$(SNAPSHOTS_OUT)/snapshots__"};\ tail -n +5 $${file} | glslangValidator --stdin -S vert; \ done - @for file in $(SNAPSHOTS)/*-Fragment.glsl.snap ; do \ - echo "Validating" $${file#"$(SNAPSHOTS)/snapshots__"};\ + @for file in $(SNAPSHOTS_OUT)/*-Fragment.glsl.snap ; do \ + echo "Validating" $${file#"$(SNAPSHOTS_OUT)/snapshots__"};\ tail -n +5 $${file} | glslangValidator --stdin -S frag; \ done - @for file in $(SNAPSHOTS)/*-Compute.glsl.snap ; do \ - echo "Validating" $${file#"$(SNAPSHOTS)/snapshots__"};\ + @for file in $(SNAPSHOTS_OUT)/*-Compute.glsl.snap ; do \ + echo "Validating" $${file#"$(SNAPSHOTS_OUT)/snapshots__"};\ tail -n +5 $${file} | glslangValidator --stdin -S comp; \ done