vk: Add an _autogen suffix autogenerated spirv file names

This prevents make from stomping on nir_spirv.h

diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index 9b15871eb43f19732c7ccb80d6da545fdaeaaada..aeebca4b9f5a086266d14cd3ccdc94742fe1bc2a 100644 (file)
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -82,7 +82,7 @@ libvulkan_la_SOURCES =                                  \
 BUILT_SOURCES =                                         \
        anv_entrypoints.h                               \
        anv_entrypoints.c                               \
-       anv_meta_spirv.h
+       anv_meta_spirv_autogen.h
 
 anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
        $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< header > $@
@@ -90,7 +90,7 @@ anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
 anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
        $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< code > $@
 
-%_spirv.h: %.c glsl_scraper.py
+%_spirv_autogen.h: %.c glsl_scraper.py
        $(AM_V_GEN) $(PYTHON2) $(srcdir)/glsl_scraper.py --glsl-only -o $@ $<
 
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c
index 8ee7eb012e63efbcec043b264a39cf3971b9c311..29995330b04bc562898c7b791479ff9dbdfa1f1d 100644 (file)
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 
 #include "anv_private.h"
-#include "anv_meta_spirv.h"
+#include "anv_meta_spirv_autogen.h"
 
 static void
 anv_device_init_meta_clear_state(struct anv_device *device)