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.
This commit is contained in:
6
src/vulkan/.gitignore
vendored
6
src/vulkan/.gitignore
vendored
@@ -1,4 +1,4 @@
|
|||||||
# Generated source files
|
# Generated source files
|
||||||
/*-spirv.h
|
/*_spirv.h
|
||||||
/entrypoints.c
|
/anv_entrypoints.c
|
||||||
/entrypoints.h
|
/anv_entrypoints.h
|
||||||
|
@@ -53,38 +53,38 @@ libvulkan_la_CFLAGS = \
|
|||||||
libvulkan_la_CXXFLAGS = \
|
libvulkan_la_CXXFLAGS = \
|
||||||
-Wall -Wextra -Wno-unused-parameter -fvisibility=hidden -O0 -g
|
-Wall -Wextra -Wno-unused-parameter -fvisibility=hidden -O0 -g
|
||||||
|
|
||||||
libvulkan_la_SOURCES = \
|
libvulkan_la_SOURCES = \
|
||||||
private.h \
|
anv_allocator.c \
|
||||||
gem.c \
|
anv_aub.c \
|
||||||
device.c \
|
anv_cmd_buffer.c \
|
||||||
anv_cmd_buffer.c \
|
anv_cmd_emit.c \
|
||||||
anv_cmd_emit.c \
|
anv_compiler.cpp \
|
||||||
aub.c \
|
anv_device.c \
|
||||||
allocator.c \
|
anv_entrypoints.c \
|
||||||
util.c \
|
anv_entrypoints.h \
|
||||||
pipeline.c \
|
anv_formats.c \
|
||||||
image.c \
|
anv_gem.c \
|
||||||
meta.c \
|
anv_image.c \
|
||||||
intel.c \
|
anv_intel.c \
|
||||||
entrypoints.c \
|
anv_meta.c \
|
||||||
entrypoints.h \
|
anv_pipeline.c \
|
||||||
x11.c \
|
anv_private.h \
|
||||||
formats.c \
|
anv_query.c \
|
||||||
compiler.cpp \
|
anv_util.c \
|
||||||
query.c
|
anv_x11.c
|
||||||
|
|
||||||
BUILT_SOURCES = \
|
BUILT_SOURCES = \
|
||||||
entrypoints.h \
|
anv_entrypoints.h \
|
||||||
entrypoints.c \
|
anv_entrypoints.c \
|
||||||
meta-spirv.h
|
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 > $@
|
$(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 > $@
|
$(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 $@ $<
|
$(AM_V_GEN) $(PYTHON2) $(srcdir)/glsl_scraper.py --glsl-only -o $@ $<
|
||||||
|
|
||||||
CLEANFILES = $(BUILT_SOURCES)
|
CLEANFILES = $(BUILT_SOURCES)
|
||||||
|
@@ -34,7 +34,7 @@
|
|||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <sys/syscall.h>
|
#include <sys/syscall.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
#ifdef HAVE_VALGRIND
|
#ifdef HAVE_VALGRIND
|
||||||
#define VG_NOACCESS_READ(__ptr) ({ \
|
#define VG_NOACCESS_READ(__ptr) ({ \
|
@@ -33,8 +33,8 @@
|
|||||||
#include <drm.h>
|
#include <drm.h>
|
||||||
#include <i915_drm.h>
|
#include <i915_drm.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
#include "aub.h"
|
#include "anv_aub.h"
|
||||||
|
|
||||||
struct anv_aub_writer {
|
struct anv_aub_writer {
|
||||||
FILE *file;
|
FILE *file;
|
@@ -27,7 +27,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
/** \file anv_cmd_buffer.c
|
/** \file anv_cmd_buffer.c
|
||||||
*
|
*
|
||||||
|
@@ -27,7 +27,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
/** \file anv_cmd_buffer.c
|
/** \file anv_cmd_buffer.c
|
||||||
*
|
*
|
||||||
|
@@ -25,7 +25,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
#include <brw_context.h>
|
#include <brw_context.h>
|
||||||
#include <brw_wm.h> /* brw_new_shader_program is here */
|
#include <brw_wm.h> /* brw_new_shader_program is here */
|
@@ -27,7 +27,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
#include "mesa/main/git_sha1.h"
|
#include "mesa/main/git_sha1.h"
|
||||||
|
|
||||||
static int
|
static int
|
@@ -108,9 +108,9 @@ print """/*
|
|||||||
* IN THE SOFTWARE.
|
* 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 {
|
struct anv_entrypoint {
|
||||||
uint32_t name;
|
uint32_t name;
|
@@ -21,7 +21,7 @@
|
|||||||
* IN THE SOFTWARE.
|
* IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
#define UNSUPPORTED 0xffff
|
#define UNSUPPORTED 0xffff
|
||||||
|
|
@@ -30,7 +30,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
#define VG_CLEAR(s) VG(memset(&s, 0, sizeof(s)))
|
#define VG_CLEAR(s) VG(memset(&s, 0, sizeof(s)))
|
||||||
|
|
@@ -27,7 +27,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
struct anv_image_view_info {
|
struct anv_image_view_info {
|
||||||
uint8_t surface_type; /**< RENDER_SURFACE_STATE.SurfaceType */
|
uint8_t surface_type; /**< RENDER_SURFACE_STATE.SurfaceType */
|
@@ -27,7 +27,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
VkResult anv_CreateDmaBufImageINTEL(
|
VkResult anv_CreateDmaBufImageINTEL(
|
||||||
VkDevice _device,
|
VkDevice _device,
|
@@ -27,8 +27,8 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
#include "meta-spirv.h"
|
#include "anv_meta_spirv.h"
|
||||||
|
|
||||||
static void
|
static void
|
||||||
anv_device_init_meta_clear_state(struct anv_device *device)
|
anv_device_init_meta_clear_state(struct anv_device *device)
|
@@ -27,7 +27,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
// Shader functions
|
// Shader functions
|
||||||
|
|
@@ -47,7 +47,7 @@
|
|||||||
#include <vulkan/vulkan_intel.h>
|
#include <vulkan/vulkan_intel.h>
|
||||||
#include <vulkan/vk_wsi_lunarg.h>
|
#include <vulkan/vk_wsi_lunarg.h>
|
||||||
|
|
||||||
#include "entrypoints.h"
|
#include "anv_entrypoints.h"
|
||||||
|
|
||||||
#include "brw_context.h"
|
#include "brw_context.h"
|
||||||
|
|
@@ -27,7 +27,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
struct anv_query_pool_slot {
|
struct anv_query_pool_slot {
|
||||||
uint64_t begin;
|
uint64_t begin;
|
@@ -28,7 +28,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
/** Log an error message. */
|
/** Log an error message. */
|
||||||
void anv_printflike(1, 2)
|
void anv_printflike(1, 2)
|
@@ -21,7 +21,7 @@
|
|||||||
* IN THE SOFTWARE.
|
* IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "private.h"
|
#include "anv_private.h"
|
||||||
|
|
||||||
#include <xcb/xcb.h>
|
#include <xcb/xcb.h>
|
||||||
#include <xcb/dri3.h>
|
#include <xcb/dri3.h>
|
Reference in New Issue
Block a user