From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 17 Aug 2015 18:40:13 +0000 (-0700)
Subject: vk: Add an _autogen suffix autogenerated spirv file names
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0deae66eb138ada869105a359ce0c87e412ed713;p=mesa.git

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 9b15871eb43..aeebca4b9f5 100644
--- 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 8ee7eb012e6..29995330b04 100644
--- 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)