summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/vulkan/.gitignore6
-rw-r--r--src/vulkan/Makefile.am56
-rw-r--r--src/vulkan/anv_allocator.c (renamed from src/vulkan/allocator.c)2
-rw-r--r--src/vulkan/anv_aub.c (renamed from src/vulkan/aub.c)4
-rw-r--r--src/vulkan/anv_aub.h (renamed from src/vulkan/aub.h)0
-rw-r--r--src/vulkan/anv_cmd_buffer.c2
-rw-r--r--src/vulkan/anv_cmd_emit.c2
-rw-r--r--src/vulkan/anv_compiler.cpp (renamed from src/vulkan/compiler.cpp)2
-rw-r--r--src/vulkan/anv_device.c (renamed from src/vulkan/device.c)2
-rw-r--r--src/vulkan/anv_entrypoints_gen.py (renamed from src/vulkan/vk_gen.py)4
-rw-r--r--src/vulkan/anv_formats.c (renamed from src/vulkan/formats.c)2
-rw-r--r--src/vulkan/anv_gem.c (renamed from src/vulkan/gem.c)2
-rw-r--r--src/vulkan/anv_image.c (renamed from src/vulkan/image.c)2
-rw-r--r--src/vulkan/anv_intel.c (renamed from src/vulkan/intel.c)2
-rw-r--r--src/vulkan/anv_meta.c (renamed from src/vulkan/meta.c)4
-rw-r--r--src/vulkan/anv_pipeline.c (renamed from src/vulkan/pipeline.c)2
-rw-r--r--src/vulkan/anv_private.h (renamed from src/vulkan/private.h)2
-rw-r--r--src/vulkan/anv_query.c (renamed from src/vulkan/query.c)2
-rw-r--r--src/vulkan/anv_util.c (renamed from src/vulkan/util.c)2
-rw-r--r--src/vulkan/anv_x11.c (renamed from src/vulkan/x11.c)2
20 files changed, 51 insertions, 51 deletions
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
index 2d0d255721b..d85b919154d 100644
--- a/src/vulkan/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) ({ \
diff --git a/src/vulkan/aub.c b/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 <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;
diff --git a/src/vulkan/aub.h b/src/vulkan/anv_aub.h
index 7a67712ff9c..7a67712ff9c 100644
--- a/src/vulkan/aub.h
+++ b/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 <unistd.h>
#include <fcntl.h>
-#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 <unistd.h>
#include <fcntl.h>
-#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
index 9152de63ec9..a50ecfde517 100644
--- a/src/vulkan/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 */
diff --git a/src/vulkan/device.c b/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 <unistd.h>
#include <fcntl.h>
-#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
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
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
index db0d29f42c7..4ce857e2a5f 100644
--- a/src/vulkan/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)))
diff --git a/src/vulkan/image.c b/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 <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 */
diff --git a/src/vulkan/intel.c b/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 <unistd.h>
#include <fcntl.h>
-#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
index 30809581ad6..f2629156f3c 100644
--- a/src/vulkan/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)
diff --git a/src/vulkan/pipeline.c b/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 <unistd.h>
#include <fcntl.h>
-#include "private.h"
+#include "anv_private.h"
// Shader functions
diff --git a/src/vulkan/private.h b/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 <vulkan/vulkan_intel.h>
#include <vulkan/vk_wsi_lunarg.h>
-#include "entrypoints.h"
+#include "anv_entrypoints.h"
#include "brw_context.h"
diff --git a/src/vulkan/query.c b/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 <unistd.h>
#include <fcntl.h>
-#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
index 21cb6484670..820356675c7 100644
--- a/src/vulkan/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)
diff --git a/src/vulkan/x11.c b/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 <xcb/xcb.h>
#include <xcb/dri3.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 17:04:46 +0000