From 2c2233e328341700b7bc5c574f9de21ab4e4116a Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Fri, 17 Jul 2015 15:04:27 -0700 Subject: [PATCH] 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. --- src/vulkan/.gitignore | 6 +- src/vulkan/Makefile.am | 56 +++++++++---------- src/vulkan/{allocator.c => anv_allocator.c} | 2 +- src/vulkan/{aub.c => anv_aub.c} | 4 +- src/vulkan/{aub.h => anv_aub.h} | 0 src/vulkan/anv_cmd_buffer.c | 2 +- src/vulkan/anv_cmd_emit.c | 2 +- src/vulkan/{compiler.cpp => anv_compiler.cpp} | 2 +- src/vulkan/{device.c => anv_device.c} | 2 +- .../{vk_gen.py => anv_entrypoints_gen.py} | 4 +- src/vulkan/{formats.c => anv_formats.c} | 2 +- src/vulkan/{gem.c => anv_gem.c} | 2 +- src/vulkan/{image.c => anv_image.c} | 2 +- src/vulkan/{intel.c => anv_intel.c} | 2 +- src/vulkan/{meta.c => anv_meta.c} | 4 +- src/vulkan/{pipeline.c => anv_pipeline.c} | 2 +- src/vulkan/{private.h => anv_private.h} | 2 +- src/vulkan/{query.c => anv_query.c} | 2 +- src/vulkan/{util.c => anv_util.c} | 2 +- src/vulkan/{x11.c => anv_x11.c} | 2 +- 20 files changed, 51 insertions(+), 51 deletions(-) rename src/vulkan/{allocator.c => anv_allocator.c} (99%) rename src/vulkan/{aub.c => anv_aub.c} (99%) rename src/vulkan/{aub.h => anv_aub.h} (100%) rename src/vulkan/{compiler.cpp => anv_compiler.cpp} (99%) rename src/vulkan/{device.c => anv_device.c} (99%) rename src/vulkan/{vk_gen.py => anv_entrypoints_gen.py} (98%) rename src/vulkan/{formats.c => anv_formats.c} (99%) rename src/vulkan/{gem.c => anv_gem.c} (99%) rename src/vulkan/{image.c => anv_image.c} (99%) rename src/vulkan/{intel.c => anv_intel.c} (99%) rename src/vulkan/{meta.c => anv_meta.c} (99%) rename src/vulkan/{pipeline.c => anv_pipeline.c} (99%) rename src/vulkan/{private.h => anv_private.h} (99%) rename src/vulkan/{query.c => anv_query.c} (99%) rename src/vulkan/{util.c => anv_util.c} (99%) rename src/vulkan/{x11.c => anv_x11.c} (99%) diff --git a/src/vulkan/.gitignore b/src/vulkan/.gitignore index 617b6d4ebb9..30c614497e5 100644 --- 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 diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index 5147f6c69d0..6d1212c532c 100644 --- 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 - -BUILT_SOURCES = \ - entrypoints.h \ - entrypoints.c \ - meta-spirv.h - -entrypoints.h : vk_gen.py $(vulkan_include_HEADERS) +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 = \ + anv_entrypoints.h \ + anv_entrypoints.c \ + anv_meta_spirv.h + +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) diff --git a/src/vulkan/allocator.c b/src/vulkan/anv_allocator.c similarity index 99% rename from src/vulkan/allocator.c rename to src/vulkan/anv_allocator.c index 2d0d255721b..d85b919154d 100644 --- a/src/vulkan/allocator.c +++ b/src/vulkan/anv_allocator.c @@ -34,7 +34,7 @@ #include #include -#include "private.h" +#include "anv_private.h" #ifdef HAVE_VALGRIND #define VG_NOACCESS_READ(__ptr) ({ \ diff --git a/src/vulkan/aub.c b/src/vulkan/anv_aub.c similarity index 99% rename from src/vulkan/aub.c rename to src/vulkan/anv_aub.c index c33defd48f5..97f124a0aad 100644 --- a/src/vulkan/aub.c +++ b/src/vulkan/anv_aub.c @@ -33,8 +33,8 @@ #include #include -#include "private.h" -#include "aub.h" +#include "anv_private.h" +#include "anv_aub.h" struct anv_aub_writer { FILE *file; diff --git a/src/vulkan/aub.h b/src/vulkan/anv_aub.h similarity index 100% rename from src/vulkan/aub.h rename to src/vulkan/anv_aub.h diff --git a/src/vulkan/anv_cmd_buffer.c b/src/vulkan/anv_cmd_buffer.c index 0d24d0bda02..4d4dfa9fb53 100644 --- a/src/vulkan/anv_cmd_buffer.c +++ b/src/vulkan/anv_cmd_buffer.c @@ -27,7 +27,7 @@ #include #include -#include "private.h" +#include "anv_private.h" /** \file anv_cmd_buffer.c * diff --git a/src/vulkan/anv_cmd_emit.c b/src/vulkan/anv_cmd_emit.c index 6f8788c3481..8654c4a0ac7 100644 --- a/src/vulkan/anv_cmd_emit.c +++ b/src/vulkan/anv_cmd_emit.c @@ -27,7 +27,7 @@ #include #include -#include "private.h" +#include "anv_private.h" /** \file anv_cmd_buffer.c * diff --git a/src/vulkan/compiler.cpp b/src/vulkan/anv_compiler.cpp similarity index 99% rename from src/vulkan/compiler.cpp rename to src/vulkan/anv_compiler.cpp index 9152de63ec9..a50ecfde517 100644 --- a/src/vulkan/compiler.cpp +++ b/src/vulkan/anv_compiler.cpp @@ -25,7 +25,7 @@ #include #include -#include "private.h" +#include "anv_private.h" #include #include /* brw_new_shader_program is here */ diff --git a/src/vulkan/device.c b/src/vulkan/anv_device.c similarity index 99% rename from src/vulkan/device.c rename to src/vulkan/anv_device.c index 1073ab00ad4..1847303a1cb 100644 --- a/src/vulkan/device.c +++ b/src/vulkan/anv_device.c @@ -27,7 +27,7 @@ #include #include -#include "private.h" +#include "anv_private.h" #include "mesa/main/git_sha1.h" static int diff --git a/src/vulkan/vk_gen.py b/src/vulkan/anv_entrypoints_gen.py similarity index 98% rename from src/vulkan/vk_gen.py rename to src/vulkan/anv_entrypoints_gen.py index d481af74ef0..96c4884d158 100644 --- a/src/vulkan/vk_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; diff --git a/src/vulkan/formats.c b/src/vulkan/anv_formats.c similarity index 99% rename from src/vulkan/formats.c rename to src/vulkan/anv_formats.c index 9d9294b7ebd..3cbcff5730f 100644 --- a/src/vulkan/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 diff --git a/src/vulkan/gem.c b/src/vulkan/anv_gem.c similarity index 99% rename from src/vulkan/gem.c rename to src/vulkan/anv_gem.c index db0d29f42c7..4ce857e2a5f 100644 --- a/src/vulkan/gem.c +++ b/src/vulkan/anv_gem.c @@ -30,7 +30,7 @@ #include #include -#include "private.h" +#include "anv_private.h" #define VG_CLEAR(s) VG(memset(&s, 0, sizeof(s))) diff --git a/src/vulkan/image.c b/src/vulkan/anv_image.c similarity index 99% rename from src/vulkan/image.c rename to src/vulkan/anv_image.c index 4b37de54dde..21099cb7730 100644 --- a/src/vulkan/image.c +++ b/src/vulkan/anv_image.c @@ -27,7 +27,7 @@ #include #include -#include "private.h" +#include "anv_private.h" struct anv_image_view_info { uint8_t surface_type; /**< RENDER_SURFACE_STATE.SurfaceType */ diff --git a/src/vulkan/intel.c b/src/vulkan/anv_intel.c similarity index 99% rename from src/vulkan/intel.c rename to src/vulkan/anv_intel.c index e314ba60586..9fc06aef6f8 100644 --- a/src/vulkan/intel.c +++ b/src/vulkan/anv_intel.c @@ -27,7 +27,7 @@ #include #include -#include "private.h" +#include "anv_private.h" VkResult anv_CreateDmaBufImageINTEL( VkDevice _device, diff --git a/src/vulkan/meta.c b/src/vulkan/anv_meta.c similarity index 99% rename from src/vulkan/meta.c rename to src/vulkan/anv_meta.c index 30809581ad6..f2629156f3c 100644 --- a/src/vulkan/meta.c +++ b/src/vulkan/anv_meta.c @@ -27,8 +27,8 @@ #include #include -#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) diff --git a/src/vulkan/pipeline.c b/src/vulkan/anv_pipeline.c similarity index 99% rename from src/vulkan/pipeline.c rename to src/vulkan/anv_pipeline.c index fdb632cd330..817b644eefb 100644 --- a/src/vulkan/pipeline.c +++ b/src/vulkan/anv_pipeline.c @@ -27,7 +27,7 @@ #include #include -#include "private.h" +#include "anv_private.h" // Shader functions diff --git a/src/vulkan/private.h b/src/vulkan/anv_private.h similarity index 99% rename from src/vulkan/private.h rename to src/vulkan/anv_private.h index ac64f294c2d..be24b514f30 100644 --- a/src/vulkan/private.h +++ b/src/vulkan/anv_private.h @@ -47,7 +47,7 @@ #include #include -#include "entrypoints.h" +#include "anv_entrypoints.h" #include "brw_context.h" diff --git a/src/vulkan/query.c b/src/vulkan/anv_query.c similarity index 99% rename from src/vulkan/query.c rename to src/vulkan/anv_query.c index b3b85897814..d7903ee2cb8 100644 --- a/src/vulkan/query.c +++ b/src/vulkan/anv_query.c @@ -27,7 +27,7 @@ #include #include -#include "private.h" +#include "anv_private.h" struct anv_query_pool_slot { uint64_t begin; diff --git a/src/vulkan/util.c b/src/vulkan/anv_util.c similarity index 99% rename from src/vulkan/util.c rename to src/vulkan/anv_util.c index 21cb6484670..820356675c7 100644 --- a/src/vulkan/util.c +++ b/src/vulkan/anv_util.c @@ -28,7 +28,7 @@ #include #include -#include "private.h" +#include "anv_private.h" /** Log an error message. */ void anv_printflike(1, 2) diff --git a/src/vulkan/x11.c b/src/vulkan/anv_x11.c similarity index 99% rename from src/vulkan/x11.c rename to src/vulkan/anv_x11.c index 1e0bdb12bd0..9ffce8d8cbf 100644 --- a/src/vulkan/x11.c +++ b/src/vulkan/anv_x11.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "private.h" +#include "anv_private.h" #include #include -- 2.30.2