vk: Prefix most filenames with anv

Jason started the task by creating anv_cmd_buffer.c and anv_cmd_emit.c. This patch finishes the task by renaming all other files except gen*_pack.h and glsl_scraper.py.
2015-07-17 15:04:27 -07:00
parent f70d079854
commit 2c2233e328
20 changed files with 49 additions and 49 deletions
--- a/src/vulkan/.gitignore
+++ b/src/vulkan/.gitignore
@@ -1,4 +1,4 @@
 # Generated source files
-/*-spirv.h
-/entrypoints.c
-/entrypoints.h
+/*_spirv.h
+/anv_entrypoints.c
+/anv_entrypoints.h
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -53,38 +53,38 @@ libvulkan_la_CFLAGS =							\
 libvulkan_la_CXXFLAGS =							\
 	-Wall -Wextra -Wno-unused-parameter -fvisibility=hidden -O0 -g

-libvulkan_la_SOURCES =				\
-	private.h				\
-	gem.c					\
-	device.c				\
-        anv_cmd_buffer.c                        \
-	anv_cmd_emit.c                          \
-	aub.c					\
-	allocator.c				\
-	util.c					\
-	pipeline.c				\
-	image.c					\
-	meta.c					\
-	intel.c					\
-	entrypoints.c				\
-	entrypoints.h				\
-	x11.c					\
-	formats.c				\
-	compiler.cpp				\
-	query.c
+libvulkan_la_SOURCES =                                  \
+	anv_allocator.c                                 \
+	anv_aub.c                                       \
+	anv_cmd_buffer.c                                \
+	anv_cmd_emit.c                                  \
+	anv_compiler.cpp                                \
+	anv_device.c                                    \
+	anv_entrypoints.c                               \
+	anv_entrypoints.h                               \
+	anv_formats.c                                   \
+	anv_gem.c                                       \
+	anv_image.c                                     \
+	anv_intel.c                                     \
+	anv_meta.c                                      \
+	anv_pipeline.c                                  \
+	anv_private.h                                   \
+	anv_query.c                                     \
+	anv_util.c                                      \
+	anv_x11.c

-BUILT_SOURCES =					\
-	entrypoints.h				\
-	entrypoints.c				\
-	meta-spirv.h
+BUILT_SOURCES =                                         \
+	anv_entrypoints.h                               \
+	anv_entrypoints.c                               \
+	anv_meta_spirv.h

-entrypoints.h : vk_gen.py $(vulkan_include_HEADERS)
+anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
 	$(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< header > $@

-entrypoints.c : vk_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.h: %.c glsl_scraper.py
 	$(AM_V_GEN) $(PYTHON2) $(srcdir)/glsl_scraper.py --glsl-only -o $@ $<

 CLEANFILES = $(BUILT_SOURCES)
--- a/src/vulkan/anv_allocator.c
+++ b/src/vulkan/anv_allocator.c
@@ -34,7 +34,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>

-#include "private.h"
+#include "anv_private.h"

 #ifdef HAVE_VALGRIND
 #define VG_NOACCESS_READ(__ptr) ({                       \
--- a/src/vulkan/anv_aub.c
+++ b/src/vulkan/anv_aub.c
@@ -33,8 +33,8 @@
 #include <drm.h>
 #include <i915_drm.h>

-#include "private.h"
-#include "aub.h"
+#include "anv_private.h"
+#include "anv_aub.h"

 struct anv_aub_writer {
   FILE *file;
--- a/src/vulkan/anv_aub.h
+++ b/src/vulkan/anv_aub.h
--- a/src/vulkan/anv_cmd_buffer.c
+++ b/src/vulkan/anv_cmd_buffer.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"

 /** \file anv_cmd_buffer.c
 *
--- a/src/vulkan/anv_cmd_emit.c
+++ b/src/vulkan/anv_cmd_emit.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"

 /** \file anv_cmd_buffer.c
 *
--- a/src/vulkan/anv_compiler.cpp
+++ b/src/vulkan/anv_compiler.cpp
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"

 #include <brw_context.h>
 #include <brw_wm.h> /* brw_new_shader_program is here */
--- a/src/vulkan/anv_device.c
+++ b/src/vulkan/anv_device.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"
 #include "mesa/main/git_sha1.h"

 static int
--- a/src/vulkan/anv_entrypoints_gen.py
+++ b/src/vulkan/anv_entrypoints_gen.py
@@ -108,9 +108,9 @@ print """/*
 * IN THE SOFTWARE.
 */

-/* This file generated from vk_gen.py, don't edit directly. */
+/* DO NOT EDIT! This is a generated file. */

-#include "private.h"
+#include "anv_private.h"

 struct anv_entrypoint {
   uint32_t name;
--- a/src/vulkan/anv_formats.c
+++ b/src/vulkan/anv_formats.c
@@ -21,7 +21,7 @@
 * IN THE SOFTWARE.
 */

-#include "private.h"
+#include "anv_private.h"

 #define UNSUPPORTED 0xffff

--- a/src/vulkan/anv_gem.c
+++ b/src/vulkan/anv_gem.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"

 #define VG_CLEAR(s) VG(memset(&s, 0, sizeof(s)))

--- a/src/vulkan/anv_image.c
+++ b/src/vulkan/anv_image.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"

 struct anv_image_view_info {
   uint8_t surface_type; /**< RENDER_SURFACE_STATE.SurfaceType */
--- a/src/vulkan/anv_intel.c
+++ b/src/vulkan/anv_intel.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"

 VkResult anv_CreateDmaBufImageINTEL(
    VkDevice                                    _device,
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -27,8 +27,8 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
-#include "meta-spirv.h"
+#include "anv_private.h"
+#include "anv_meta_spirv.h"

 static void
 anv_device_init_meta_clear_state(struct anv_device *device)
--- a/src/vulkan/anv_pipeline.c
+++ b/src/vulkan/anv_pipeline.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"

 // Shader functions

--- a/src/vulkan/anv_private.h
+++ b/src/vulkan/anv_private.h
@@ -47,7 +47,7 @@
 #include <vulkan/vulkan_intel.h>
 #include <vulkan/vk_wsi_lunarg.h>

-#include "entrypoints.h"
+#include "anv_entrypoints.h"

 #include "brw_context.h"

--- a/src/vulkan/anv_query.c
+++ b/src/vulkan/anv_query.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <fcntl.h>

-#include "private.h"
+#include "anv_private.h"

 struct anv_query_pool_slot {
   uint64_t begin;
--- a/src/vulkan/anv_util.c
+++ b/src/vulkan/anv_util.c
@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <assert.h>

-#include "private.h"
+#include "anv_private.h"

 /** Log an error message.  */
 void anv_printflike(1, 2)
--- a/src/vulkan/anv_x11.c
+++ b/src/vulkan/anv_x11.c
@@ -21,7 +21,7 @@
 * IN THE SOFTWARE.
 */

-#include "private.h"
+#include "anv_private.h"

 #include <xcb/xcb.h>
 #include <xcb/dri3.h>