Mesa (master): v3d: Rename the driver files from "vc5" to "v3d".
Eric Anholt
anholt at kemper.freedesktop.org
Wed May 16 21:26:28 UTC 2018
Module: Mesa
Branch: master
Commit: 8c47ebbd232704ab048eab2572e2b2a44f38957a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c47ebbd232704ab048eab2572e2b2a44f38957a
Author: Eric Anholt <eric at anholt.net>
Date: Tue May 1 12:24:48 2018 -0700
v3d: Rename the driver files from "vc5" to "v3d".
---
configure.ac | 4 +-
src/broadcom/Makefile.am | 2 +-
src/broadcom/{Makefile.vc5.am => Makefile.v3d.am} | 0
src/gallium/Makefile.am | 2 +-
src/gallium/auxiliary/target-helpers/drm_helper.h | 2 +-
src/gallium/drivers/{vc5 => v3d}/.editorconfig | 0
src/gallium/drivers/{vc5 => v3d}/Automake.inc | 4 +-
src/gallium/drivers/{vc5 => v3d}/Makefile.am | 0
src/gallium/drivers/v3d/Makefile.sources | 36 ++++++++++++++++
src/gallium/drivers/{vc5 => v3d}/meson.build | 50 +++++++++++-----------
.../drivers/{vc5/vc5_blit.c => v3d/v3d_blit.c} | 2 +-
.../drivers/{vc5/vc5_bufmgr.c => v3d/v3d_bufmgr.c} | 4 +-
.../drivers/{vc5/vc5_bufmgr.h => v3d/v3d_bufmgr.h} | 2 +-
src/gallium/drivers/{vc5/vc5_cl.c => v3d/v3d_cl.c} | 2 +-
src/gallium/drivers/{vc5/vc5_cl.h => v3d/v3d_cl.h} | 0
.../{vc5/vc5_context.c => v3d/v3d_context.c} | 6 +--
.../{vc5/vc5_context.h => v3d/v3d_context.h} | 8 ++--
.../drivers/{vc5/vc5_fence.c => v3d/v3d_fence.c} | 4 +-
.../vc5_format_table.h => v3d/v3d_format_table.h} | 0
.../{vc5/vc5_formats.c => v3d/v3d_formats.c} | 4 +-
.../drivers/{vc5/vc5_job.c => v3d/v3d_job.c} | 2 +-
.../{vc5/vc5_program.c => v3d/v3d_program.c} | 2 +-
.../drivers/{vc5/vc5_query.c => v3d/v3d_query.c} | 2 +-
.../{vc5/vc5_resource.c => v3d/v3d_resource.c} | 8 ++--
.../{vc5/vc5_resource.h => v3d/v3d_resource.h} | 2 +-
.../drivers/{vc5/vc5_screen.c => v3d/v3d_screen.c} | 6 +--
.../drivers/{vc5/vc5_screen.h => v3d/v3d_screen.h} | 0
.../{vc5/vc5_simulator.c => v3d/v3d_simulator.c} | 6 +--
.../v3d_simulator_wrapper.cpp} | 4 +-
.../v3d_simulator_wrapper.h} | 0
.../drivers/{vc5/vc5_tiling.c => v3d/v3d_tiling.c} | 6 +--
.../drivers/{vc5/vc5_tiling.h => v3d/v3d_tiling.h} | 0
.../{vc5/vc5_uniforms.c => v3d/v3d_uniforms.c} | 2 +-
src/gallium/drivers/{vc5 => v3d}/v3dx_context.h | 2 +-
.../drivers/{vc5/vc5_draw.c => v3d/v3dx_draw.c} | 6 +--
.../drivers/{vc5/vc5_emit.c => v3d/v3dx_emit.c} | 2 +-
.../drivers/{vc5 => v3d}/v3dx_format_table.c | 4 +-
src/gallium/drivers/{vc5 => v3d}/v3dx_job.c | 2 +-
.../drivers/{vc5/vc5_rcl.c => v3d/v3dx_rcl.c} | 4 +-
src/gallium/drivers/{vc5 => v3d}/v3dx_simulator.c | 6 +--
.../drivers/{vc5/vc5_state.c => v3d/v3dx_state.c} | 4 +-
src/gallium/drivers/vc5/Makefile.sources | 36 ----------------
src/gallium/meson.build | 4 +-
src/gallium/targets/dri/Makefile.am | 2 +-
src/gallium/winsys/{vc5 => v3d}/drm/Android.mk | 0
src/gallium/winsys/{vc5 => v3d}/drm/Makefile.am | 0
src/gallium/winsys/v3d/drm/Makefile.sources | 3 ++
src/gallium/winsys/{vc5 => v3d}/drm/meson.build | 2 +-
.../vc5_drm_public.h => v3d/drm/v3d_drm_public.h} | 0
.../vc5_drm_winsys.c => v3d/drm/v3d_drm_winsys.c} | 4 +-
src/gallium/winsys/vc5/drm/Makefile.sources | 3 --
51 files changed, 128 insertions(+), 128 deletions(-)
diff --git a/configure.ac b/configure.ac
index 81ce001e3c..a73471b7b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3037,8 +3037,8 @@ AC_CONFIG_FILES([Makefile
src/gallium/drivers/tegra/Makefile
src/gallium/drivers/etnaviv/Makefile
src/gallium/drivers/imx/Makefile
+ src/gallium/drivers/v3d/Makefile
src/gallium/drivers/vc4/Makefile
- src/gallium/drivers/vc5/Makefile
src/gallium/drivers/virgl/Makefile
src/gallium/state_trackers/clover/Makefile
src/gallium/state_trackers/dri/Makefile
@@ -3085,8 +3085,8 @@ AC_CONFIG_FILES([Makefile
src/gallium/winsys/sw/wrapper/Makefile
src/gallium/winsys/sw/xlib/Makefile
src/gallium/winsys/tegra/drm/Makefile
+ src/gallium/winsys/v3d/drm/Makefile
src/gallium/winsys/vc4/drm/Makefile
- src/gallium/winsys/vc5/drm/Makefile
src/gallium/winsys/virgl/drm/Makefile
src/gallium/winsys/virgl/vtest/Makefile
src/gbm/Makefile
diff --git a/src/broadcom/Makefile.am b/src/broadcom/Makefile.am
index 49267de73b..4faa772154 100644
--- a/src/broadcom/Makefile.am
+++ b/src/broadcom/Makefile.am
@@ -60,6 +60,6 @@ PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
include Makefile.genxml.am
include Makefile.cle.am
-include Makefile.vc5.am
+include Makefile.v3d.am
CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/broadcom/Makefile.vc5.am b/src/broadcom/Makefile.v3d.am
similarity index 100%
rename from src/broadcom/Makefile.vc5.am
rename to src/broadcom/Makefile.v3d.am
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 351bbf4fa6..e75c186683 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -90,7 +90,7 @@ endif
## v3d
if HAVE_GALLIUM_V3D
-SUBDIRS += drivers/vc5 winsys/vc5/drm
+SUBDIRS += drivers/v3d winsys/v3d/drm
endif
## virgl
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
index c494848888..7eefa6e42e 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
@@ -311,7 +311,7 @@ pipe_vc4_create_screen(int fd, const struct pipe_screen_config *config)
#endif
#ifdef GALLIUM_V3D
-#include "vc5/drm/vc5_drm_public.h"
+#include "v3d/drm/v3d_drm_public.h"
struct pipe_screen *
pipe_v3d_create_screen(int fd, const struct pipe_screen_config *config)
diff --git a/src/gallium/drivers/vc5/.editorconfig b/src/gallium/drivers/v3d/.editorconfig
similarity index 100%
rename from src/gallium/drivers/vc5/.editorconfig
rename to src/gallium/drivers/v3d/.editorconfig
diff --git a/src/gallium/drivers/vc5/Automake.inc b/src/gallium/drivers/v3d/Automake.inc
similarity index 68%
rename from src/gallium/drivers/vc5/Automake.inc
rename to src/gallium/drivers/v3d/Automake.inc
index 612bc21615..7cf8ae7cd8 100644
--- a/src/gallium/drivers/vc5/Automake.inc
+++ b/src/gallium/drivers/v3d/Automake.inc
@@ -3,8 +3,8 @@ if HAVE_GALLIUM_V3D
TARGET_DRIVERS += v3d
TARGET_CPPFLAGS += -DGALLIUM_V3D
TARGET_LIB_DEPS += \
- $(top_builddir)/src/gallium/winsys/vc5/drm/libv3ddrm.la \
- $(top_builddir)/src/gallium/drivers/vc5/libv3d.la \
+ $(top_builddir)/src/gallium/winsys/v3d/drm/libv3ddrm.la \
+ $(top_builddir)/src/gallium/drivers/v3d/libv3d.la \
$(top_builddir)/src/broadcom/libbroadcom.la
if !HAVE_GALLIUM_VC4
diff --git a/src/gallium/drivers/vc5/Makefile.am b/src/gallium/drivers/v3d/Makefile.am
similarity index 100%
rename from src/gallium/drivers/vc5/Makefile.am
rename to src/gallium/drivers/v3d/Makefile.am
diff --git a/src/gallium/drivers/v3d/Makefile.sources b/src/gallium/drivers/v3d/Makefile.sources
new file mode 100644
index 0000000000..c81ccb4201
--- /dev/null
+++ b/src/gallium/drivers/v3d/Makefile.sources
@@ -0,0 +1,36 @@
+C_SOURCES := \
+ v3d_blit.c \
+ v3d_bufmgr.c \
+ v3d_bufmgr.h \
+ v3d_cl.c \
+ v3d_cl.h \
+ v3d_context.c \
+ v3d_context.h \
+ v3d_fence.c \
+ v3d_formats.c \
+ v3d_format_table.h \
+ v3d_job.c \
+ v3d_program.c \
+ v3d_query.c \
+ v3d_resource.c \
+ v3d_resource.h \
+ v3d_screen.c \
+ v3d_screen.h \
+ v3d_simulator.c \
+ v3d_simulator_wrapper.cpp \
+ v3d_simulator_wrapper.h \
+ v3d_tiling.c \
+ v3d_tiling.h \
+ v3d_uniforms.c \
+ $()
+
+V3D_PER_VERSION_SOURCES = \
+ v3dx_context.h \
+ v3dx_draw.c \
+ v3dx_emit.c \
+ v3dx_format_table.c \
+ v3dx_job.c \
+ v3dx_rcl.c \
+ v3dx_simulator.c \
+ v3dx_state.c \
+ $()
diff --git a/src/gallium/drivers/vc5/meson.build b/src/gallium/drivers/v3d/meson.build
similarity index 84%
rename from src/gallium/drivers/vc5/meson.build
rename to src/gallium/drivers/v3d/meson.build
index 63460dc443..38021515ed 100644
--- a/src/gallium/drivers/vc5/meson.build
+++ b/src/gallium/drivers/v3d/meson.build
@@ -19,37 +19,37 @@
# SOFTWARE.
files_libv3d = files(
- 'vc5_blit.c',
- 'vc5_bufmgr.c',
- 'vc5_bufmgr.h',
- 'vc5_cl.c',
- 'vc5_cl.h',
- 'vc5_context.c',
- 'vc5_context.h',
- 'vc5_fence.c',
- 'vc5_formats.c',
- 'vc5_job.c',
- 'vc5_program.c',
- 'vc5_query.c',
- 'vc5_resource.c',
- 'vc5_resource.h',
- 'vc5_screen.c',
- 'vc5_screen.h',
- 'vc5_simulator.c',
- 'vc5_simulator_wrapper.cpp',
- 'vc5_tiling.c',
- 'vc5_tiling.h',
- 'vc5_uniforms.c',
+ 'v3d_blit.c',
+ 'v3d_bufmgr.c',
+ 'v3d_bufmgr.h',
+ 'v3d_cl.c',
+ 'v3d_cl.h',
+ 'v3d_context.c',
+ 'v3d_context.h',
+ 'v3d_fence.c',
+ 'v3d_formats.c',
+ 'v3d_job.c',
+ 'v3d_program.c',
+ 'v3d_query.c',
+ 'v3d_resource.c',
+ 'v3d_resource.h',
+ 'v3d_screen.c',
+ 'v3d_screen.h',
+ 'v3d_simulator.c',
+ 'v3d_simulator_wrapper.cpp',
+ 'v3d_tiling.c',
+ 'v3d_tiling.h',
+ 'v3d_uniforms.c',
)
files_per_version = files(
+ 'v3dx_draw.c',
+ 'v3dx_emit.c',
'v3dx_format_table.c',
'v3dx_job.c',
+ 'v3dx_rcl.c',
'v3dx_simulator.c',
- 'vc5_draw.c',
- 'vc5_emit.c',
- 'vc5_rcl.c',
- 'vc5_state.c',
+ 'v3dx_state.c',
)
v3dv3_c_args = []
diff --git a/src/gallium/drivers/vc5/vc5_blit.c b/src/gallium/drivers/v3d/v3d_blit.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_blit.c
rename to src/gallium/drivers/v3d/v3d_blit.c
index 66f530723f..7c67d4561b 100644
--- a/src/gallium/drivers/vc5/vc5_blit.c
+++ b/src/gallium/drivers/v3d/v3d_blit.c
@@ -24,7 +24,7 @@
#include "util/u_format.h"
#include "util/u_surface.h"
#include "util/u_blitter.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
#if 0
static struct pipe_surface *
diff --git a/src/gallium/drivers/vc5/vc5_bufmgr.c b/src/gallium/drivers/v3d/v3d_bufmgr.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_bufmgr.c
rename to src/gallium/drivers/v3d/v3d_bufmgr.c
index 2773df3cf2..ef2a5fa07b 100644
--- a/src/gallium/drivers/vc5/vc5_bufmgr.c
+++ b/src/gallium/drivers/v3d/v3d_bufmgr.c
@@ -32,8 +32,8 @@
#include "util/u_memory.h"
#include "util/ralloc.h"
-#include "vc5_context.h"
-#include "vc5_screen.h"
+#include "v3d_context.h"
+#include "v3d_screen.h"
#ifdef HAVE_VALGRIND
#include <valgrind.h>
diff --git a/src/gallium/drivers/vc5/vc5_bufmgr.h b/src/gallium/drivers/v3d/v3d_bufmgr.h
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_bufmgr.h
rename to src/gallium/drivers/v3d/v3d_bufmgr.h
index cca2b22874..4519a20602 100644
--- a/src/gallium/drivers/vc5/vc5_bufmgr.h
+++ b/src/gallium/drivers/v3d/v3d_bufmgr.h
@@ -28,7 +28,7 @@
#include "util/u_hash_table.h"
#include "util/u_inlines.h"
#include "util/list.h"
-#include "vc5_screen.h"
+#include "v3d_screen.h"
struct vc5_context;
diff --git a/src/gallium/drivers/vc5/vc5_cl.c b/src/gallium/drivers/v3d/v3d_cl.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_cl.c
rename to src/gallium/drivers/v3d/v3d_cl.c
index a10c1649e0..2ffb7ea9a2 100644
--- a/src/gallium/drivers/vc5/vc5_cl.c
+++ b/src/gallium/drivers/v3d/v3d_cl.c
@@ -23,7 +23,7 @@
#include "util/u_math.h"
#include "util/ralloc.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
/* The branching packets are the same across V3D versions. */
#define V3D_VERSION 33
#include "broadcom/common/v3d_macros.h"
diff --git a/src/gallium/drivers/vc5/vc5_cl.h b/src/gallium/drivers/v3d/v3d_cl.h
similarity index 100%
rename from src/gallium/drivers/vc5/vc5_cl.h
rename to src/gallium/drivers/v3d/v3d_cl.h
diff --git a/src/gallium/drivers/vc5/vc5_context.c b/src/gallium/drivers/v3d/v3d_context.c
similarity index 98%
rename from src/gallium/drivers/vc5/vc5_context.c
rename to src/gallium/drivers/v3d/v3d_context.c
index b6d1234879..cb37eba384 100644
--- a/src/gallium/drivers/vc5/vc5_context.c
+++ b/src/gallium/drivers/v3d/v3d_context.c
@@ -34,9 +34,9 @@
#include "indices/u_primconvert.h"
#include "pipe/p_screen.h"
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_resource.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_resource.h"
void
vc5_flush(struct pipe_context *pctx)
diff --git a/src/gallium/drivers/vc5/vc5_context.h b/src/gallium/drivers/v3d/v3d_context.h
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_context.h
rename to src/gallium/drivers/v3d/v3d_context.h
index 5df02b3907..7c17eccd47 100644
--- a/src/gallium/drivers/vc5/vc5_context.h
+++ b/src/gallium/drivers/v3d/v3d_context.h
@@ -37,15 +37,15 @@
#include "util/slab.h"
#include "xf86drm.h"
#include "v3d_drm.h"
-#include "vc5_screen.h"
+#include "v3d_screen.h"
struct vc5_job;
struct vc5_bo;
void vc5_job_add_bo(struct vc5_job *job, struct vc5_bo *bo);
-#include "vc5_bufmgr.h"
-#include "vc5_resource.h"
-#include "vc5_cl.h"
+#include "v3d_bufmgr.h"
+#include "v3d_resource.h"
+#include "v3d_cl.h"
#ifdef USE_V3D_SIMULATOR
#define using_vc5_simulator true
diff --git a/src/gallium/drivers/vc5/vc5_fence.c b/src/gallium/drivers/v3d/v3d_fence.c
similarity index 98%
rename from src/gallium/drivers/vc5/vc5_fence.c
rename to src/gallium/drivers/v3d/v3d_fence.c
index 731dd6db90..54bce56240 100644
--- a/src/gallium/drivers/vc5/vc5_fence.c
+++ b/src/gallium/drivers/v3d/v3d_fence.c
@@ -36,8 +36,8 @@
#include "util/u_inlines.h"
-#include "vc5_context.h"
-#include "vc5_bufmgr.h"
+#include "v3d_context.h"
+#include "v3d_bufmgr.h"
struct vc5_fence {
struct pipe_reference reference;
diff --git a/src/gallium/drivers/vc5/vc5_format_table.h b/src/gallium/drivers/v3d/v3d_format_table.h
similarity index 100%
rename from src/gallium/drivers/vc5/vc5_format_table.h
rename to src/gallium/drivers/v3d/v3d_format_table.h
diff --git a/src/gallium/drivers/vc5/vc5_formats.c b/src/gallium/drivers/v3d/v3d_formats.c
similarity index 98%
rename from src/gallium/drivers/vc5/vc5_formats.c
rename to src/gallium/drivers/v3d/v3d_formats.c
index b65b7cdbe7..8424b368cf 100644
--- a/src/gallium/drivers/vc5/vc5_formats.c
+++ b/src/gallium/drivers/v3d/v3d_formats.c
@@ -34,8 +34,8 @@
#include "util/macros.h"
-#include "vc5_context.h"
-#include "vc5_format_table.h"
+#include "v3d_context.h"
+#include "v3d_format_table.h"
static const struct vc5_format *
get_format(const struct v3d_device_info *devinfo, enum pipe_format f)
diff --git a/src/gallium/drivers/vc5/vc5_job.c b/src/gallium/drivers/v3d/v3d_job.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_job.c
rename to src/gallium/drivers/v3d/v3d_job.c
index 7973b9e682..85c64df34c 100644
--- a/src/gallium/drivers/vc5/vc5_job.c
+++ b/src/gallium/drivers/v3d/v3d_job.c
@@ -27,7 +27,7 @@
*/
#include <xf86drm.h>
-#include "vc5_context.h"
+#include "v3d_context.h"
/* The OQ/semaphore packets are the same across V3D versions. */
#define V3D_VERSION 33
#include "broadcom/cle/v3dx_pack.h"
diff --git a/src/gallium/drivers/vc5/vc5_program.c b/src/gallium/drivers/v3d/v3d_program.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_program.c
rename to src/gallium/drivers/v3d/v3d_program.c
index 23d2d73a2d..ce2e0be8ed 100644
--- a/src/gallium/drivers/vc5/vc5_program.c
+++ b/src/gallium/drivers/v3d/v3d_program.c
@@ -33,7 +33,7 @@
#include "compiler/nir/nir_builder.h"
#include "nir/tgsi_to_nir.h"
#include "compiler/v3d_compiler.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
#include "broadcom/cle/v3d_packet_v33_pack.h"
#include "mesa/state_tracker/st_glsl_types.h"
diff --git a/src/gallium/drivers/vc5/vc5_query.c b/src/gallium/drivers/v3d/v3d_query.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_query.c
rename to src/gallium/drivers/v3d/v3d_query.c
index 9aa80cf536..f645544bed 100644
--- a/src/gallium/drivers/vc5/vc5_query.c
+++ b/src/gallium/drivers/v3d/v3d_query.c
@@ -33,7 +33,7 @@
* do the calculations in software at draw time.
*/
-#include "vc5_context.h"
+#include "v3d_context.h"
#include "broadcom/cle/v3d_packet_v33_pack.h"
struct vc5_query
diff --git a/src/gallium/drivers/vc5/vc5_resource.c b/src/gallium/drivers/v3d/v3d_resource.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_resource.c
rename to src/gallium/drivers/v3d/v3d_resource.c
index 3c2ed27077..1cd3f1949a 100644
--- a/src/gallium/drivers/vc5/vc5_resource.c
+++ b/src/gallium/drivers/v3d/v3d_resource.c
@@ -33,10 +33,10 @@
#include "util/u_format_zs.h"
#include "drm_fourcc.h"
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_resource.h"
-#include "vc5_tiling.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_resource.h"
+#include "v3d_tiling.h"
#include "broadcom/cle/v3d_packet_v33_pack.h"
static void
diff --git a/src/gallium/drivers/vc5/vc5_resource.h b/src/gallium/drivers/v3d/v3d_resource.h
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_resource.h
rename to src/gallium/drivers/v3d/v3d_resource.h
index 2af355354a..dc68f803e9 100644
--- a/src/gallium/drivers/vc5/vc5_resource.h
+++ b/src/gallium/drivers/v3d/v3d_resource.h
@@ -25,7 +25,7 @@
#ifndef VC5_RESOURCE_H
#define VC5_RESOURCE_H
-#include "vc5_screen.h"
+#include "v3d_screen.h"
#include "util/u_transfer.h"
/* A UIFblock is a 256-byte region of memory that's 256-byte aligned. These
diff --git a/src/gallium/drivers/vc5/vc5_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_screen.c
rename to src/gallium/drivers/v3d/v3d_screen.c
index 9b36785732..95e6a6907f 100644
--- a/src/gallium/drivers/vc5/vc5_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -34,9 +34,9 @@
#include "util/ralloc.h"
#include <xf86drm.h>
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_resource.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_resource.h"
#include "compiler/v3d_compiler.h"
static const char *
diff --git a/src/gallium/drivers/vc5/vc5_screen.h b/src/gallium/drivers/v3d/v3d_screen.h
similarity index 100%
rename from src/gallium/drivers/vc5/vc5_screen.h
rename to src/gallium/drivers/v3d/v3d_screen.h
diff --git a/src/gallium/drivers/vc5/vc5_simulator.c b/src/gallium/drivers/v3d/v3d_simulator.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_simulator.c
rename to src/gallium/drivers/v3d/v3d_simulator.c
index 4a1650074c..86e4ed3be3 100644
--- a/src/gallium/drivers/vc5/vc5_simulator.c
+++ b/src/gallium/drivers/v3d/v3d_simulator.c
@@ -54,10 +54,10 @@
#include "util/set.h"
#include "util/u_memory.h"
#include "util/u_mm.h"
-#include "vc5_simulator_wrapper.h"
+#include "v3d_simulator_wrapper.h"
-#include "vc5_screen.h"
-#include "vc5_context.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
/** Global (across GEM fds) state for the simulator */
static struct vc5_simulator_state {
diff --git a/src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp b/src/gallium/drivers/v3d/v3d_simulator_wrapper.cpp
similarity index 97%
rename from src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp
rename to src/gallium/drivers/v3d/v3d_simulator_wrapper.cpp
index bee3ce70bf..7b04ded2b5 100644
--- a/src/gallium/drivers/vc5/vc5_simulator_wrapper.cpp
+++ b/src/gallium/drivers/v3d/v3d_simulator_wrapper.cpp
@@ -24,12 +24,12 @@
/** @file
*
* Wraps bits of the V3D simulator interface in a C interface for the
- * vc5_simulator.c code to use.
+ * v3d_simulator.c code to use.
*/
#ifdef USE_V3D_SIMULATOR
-#include "vc5_simulator_wrapper.h"
+#include "v3d_simulator_wrapper.h"
#define V3D_TECH_VERSION 3
#define V3D_REVISION 3
diff --git a/src/gallium/drivers/vc5/vc5_simulator_wrapper.h b/src/gallium/drivers/v3d/v3d_simulator_wrapper.h
similarity index 100%
rename from src/gallium/drivers/vc5/vc5_simulator_wrapper.h
rename to src/gallium/drivers/v3d/v3d_simulator_wrapper.h
diff --git a/src/gallium/drivers/vc5/vc5_tiling.c b/src/gallium/drivers/v3d/v3d_tiling.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_tiling.c
rename to src/gallium/drivers/v3d/v3d_tiling.c
index cbd86d5566..f9c4a34218 100644
--- a/src/gallium/drivers/vc5/vc5_tiling.c
+++ b/src/gallium/drivers/v3d/v3d_tiling.c
@@ -28,9 +28,9 @@
*/
#include <stdint.h>
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_tiling.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_tiling.h"
/** Return the width in pixels of a 64-byte microtile. */
uint32_t
diff --git a/src/gallium/drivers/vc5/vc5_tiling.h b/src/gallium/drivers/v3d/v3d_tiling.h
similarity index 100%
rename from src/gallium/drivers/vc5/vc5_tiling.h
rename to src/gallium/drivers/v3d/v3d_tiling.h
diff --git a/src/gallium/drivers/vc5/vc5_uniforms.c b/src/gallium/drivers/v3d/v3d_uniforms.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_uniforms.c
rename to src/gallium/drivers/v3d/v3d_uniforms.c
index 03b6d8381c..c7a39b50a7 100644
--- a/src/gallium/drivers/vc5/vc5_uniforms.c
+++ b/src/gallium/drivers/v3d/v3d_uniforms.c
@@ -24,7 +24,7 @@
#include "util/u_pack_color.h"
#include "util/format_srgb.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
#include "compiler/v3d_compiler.h"
#include "broadcom/cle/v3d_packet_v33_pack.h"
diff --git a/src/gallium/drivers/vc5/v3dx_context.h b/src/gallium/drivers/v3d/v3dx_context.h
similarity index 98%
rename from src/gallium/drivers/vc5/v3dx_context.h
rename to src/gallium/drivers/v3d/v3dx_context.h
index 538aed68be..faeda2c0fb 100644
--- a/src/gallium/drivers/vc5/v3dx_context.h
+++ b/src/gallium/drivers/v3d/v3dx_context.h
@@ -23,7 +23,7 @@
*/
/* This file generates the per-v3d-version function prototypes. It must only
- * be included from vc5_context.h.
+ * be included from v3d_context.h.
*/
struct v3d_hw;
diff --git a/src/gallium/drivers/vc5/vc5_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_draw.c
rename to src/gallium/drivers/v3d/v3dx_draw.c
index ecb1aa3783..03ee6b2b19 100644
--- a/src/gallium/drivers/vc5/vc5_draw.c
+++ b/src/gallium/drivers/v3d/v3dx_draw.c
@@ -29,9 +29,9 @@
#include "util/u_upload_mgr.h"
#include "indices/u_primconvert.h"
-#include "vc5_context.h"
-#include "vc5_resource.h"
-#include "vc5_cl.h"
+#include "v3d_context.h"
+#include "v3d_resource.h"
+#include "v3d_cl.h"
#include "broadcom/compiler/v3d_compiler.h"
#include "broadcom/common/v3d_macros.h"
#include "broadcom/cle/v3dx_pack.h"
diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/v3d/v3dx_emit.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_emit.c
rename to src/gallium/drivers/v3d/v3dx_emit.c
index cb8af95330..e2aba356de 100644
--- a/src/gallium/drivers/vc5/vc5_emit.c
+++ b/src/gallium/drivers/v3d/v3dx_emit.c
@@ -23,7 +23,7 @@
#include "util/u_format.h"
#include "util/u_half.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
#include "broadcom/common/v3d_macros.h"
#include "broadcom/cle/v3dx_pack.h"
#include "broadcom/compiler/v3d_compiler.h"
diff --git a/src/gallium/drivers/vc5/v3dx_format_table.c b/src/gallium/drivers/v3d/v3dx_format_table.c
similarity index 99%
rename from src/gallium/drivers/vc5/v3dx_format_table.c
rename to src/gallium/drivers/v3d/v3dx_format_table.c
index cc356fc381..458488119c 100644
--- a/src/gallium/drivers/vc5/v3dx_format_table.c
+++ b/src/gallium/drivers/v3d/v3dx_format_table.c
@@ -23,10 +23,10 @@
#include "util/u_format.h"
-#include "vc5_context.h"
+#include "v3d_context.h"
#include "broadcom/cle/v3dx_pack.h"
#include "broadcom/common/v3d_macros.h"
-#include "vc5_format_table.h"
+#include "v3d_format_table.h"
#define SWIZ(x,y,z,w) { \
PIPE_SWIZZLE_##x, \
diff --git a/src/gallium/drivers/vc5/v3dx_job.c b/src/gallium/drivers/v3d/v3dx_job.c
similarity index 99%
rename from src/gallium/drivers/vc5/v3dx_job.c
rename to src/gallium/drivers/v3d/v3dx_job.c
index ca3831c75b..5e1a345b17 100644
--- a/src/gallium/drivers/vc5/v3dx_job.c
+++ b/src/gallium/drivers/v3d/v3dx_job.c
@@ -27,7 +27,7 @@
* kernel.
*/
-#include "vc5_context.h"
+#include "v3d_context.h"
#include "broadcom/cle/v3dx_pack.h"
void v3dX(bcl_epilogue)(struct vc5_context *vc5, struct vc5_job *job)
diff --git a/src/gallium/drivers/vc5/vc5_rcl.c b/src/gallium/drivers/v3d/v3dx_rcl.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_rcl.c
rename to src/gallium/drivers/v3d/v3dx_rcl.c
index 7d32d9ad0e..3801d03ece 100644
--- a/src/gallium/drivers/vc5/vc5_rcl.c
+++ b/src/gallium/drivers/v3d/v3dx_rcl.c
@@ -22,8 +22,8 @@
*/
#include "util/u_format.h"
-#include "vc5_context.h"
-#include "vc5_tiling.h"
+#include "v3d_context.h"
+#include "v3d_tiling.h"
#include "broadcom/common/v3d_macros.h"
#include "broadcom/cle/v3dx_pack.h"
diff --git a/src/gallium/drivers/vc5/v3dx_simulator.c b/src/gallium/drivers/v3d/v3dx_simulator.c
similarity index 98%
rename from src/gallium/drivers/vc5/v3dx_simulator.c
rename to src/gallium/drivers/v3d/v3dx_simulator.c
index 1162869be2..ee8b6f2b9f 100644
--- a/src/gallium/drivers/vc5/v3dx_simulator.c
+++ b/src/gallium/drivers/v3d/v3dx_simulator.c
@@ -33,9 +33,9 @@
#ifdef USE_V3D_SIMULATOR
-#include "vc5_screen.h"
-#include "vc5_context.h"
-#include "vc5_simulator_wrapper.h"
+#include "v3d_screen.h"
+#include "v3d_context.h"
+#include "v3d_simulator_wrapper.h"
#define HW_REGISTER_RO(x) (x)
#define HW_REGISTER_RW(x) (x)
diff --git a/src/gallium/drivers/vc5/vc5_state.c b/src/gallium/drivers/v3d/v3dx_state.c
similarity index 99%
rename from src/gallium/drivers/vc5/vc5_state.c
rename to src/gallium/drivers/v3d/v3dx_state.c
index 0ed0acd16a..e992796a21 100644
--- a/src/gallium/drivers/vc5/vc5_state.c
+++ b/src/gallium/drivers/v3d/v3dx_state.c
@@ -31,8 +31,8 @@
#include "util/u_half.h"
#include "util/u_helpers.h"
-#include "vc5_context.h"
-#include "vc5_tiling.h"
+#include "v3d_context.h"
+#include "v3d_tiling.h"
#include "broadcom/common/v3d_macros.h"
#include "broadcom/cle/v3dx_pack.h"
diff --git a/src/gallium/drivers/vc5/Makefile.sources b/src/gallium/drivers/vc5/Makefile.sources
deleted file mode 100644
index 36fcc0b90b..0000000000
--- a/src/gallium/drivers/vc5/Makefile.sources
+++ /dev/null
@@ -1,36 +0,0 @@
-C_SOURCES := \
- vc5_blit.c \
- vc5_bufmgr.c \
- vc5_bufmgr.h \
- vc5_cl.c \
- vc5_cl.h \
- vc5_context.c \
- vc5_context.h \
- vc5_fence.c \
- vc5_formats.c \
- vc5_format_table.h \
- vc5_job.c \
- vc5_program.c \
- vc5_query.c \
- vc5_resource.c \
- vc5_resource.h \
- vc5_screen.c \
- vc5_screen.h \
- vc5_simulator.c \
- vc5_simulator_wrapper.cpp \
- vc5_simulator_wrapper.h \
- vc5_tiling.c \
- vc5_tiling.h \
- vc5_uniforms.c \
- $()
-
-V3D_PER_VERSION_SOURCES = \
- v3dx_context.h \
- v3dx_format_table.c \
- v3dx_job.c \
- v3dx_simulator.c \
- vc5_draw.c \
- vc5_emit.c \
- vc5_rcl.c \
- vc5_state.c \
- $()
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index a93bf32139..561af9d339 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -95,8 +95,8 @@ else
driver_pl111 = declare_dependency()
endif
if with_gallium_v3d
- subdir('winsys/vc5/drm')
- subdir('drivers/vc5')
+ subdir('winsys/v3d/drm')
+ subdir('drivers/v3d')
else
driver_v3d = declare_dependency()
endif
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index a0778b64e5..a857b5129f 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -76,8 +76,8 @@ include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
include $(top_srcdir)/src/gallium/drivers/tegra/Automake.inc
+include $(top_srcdir)/src/gallium/drivers/v3d/Automake.inc
include $(top_srcdir)/src/gallium/drivers/vc4/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/vc5/Automake.inc
include $(top_srcdir)/src/gallium/drivers/pl111/Automake.inc
include $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc
diff --git a/src/gallium/winsys/vc5/drm/Android.mk b/src/gallium/winsys/v3d/drm/Android.mk
similarity index 100%
rename from src/gallium/winsys/vc5/drm/Android.mk
rename to src/gallium/winsys/v3d/drm/Android.mk
diff --git a/src/gallium/winsys/vc5/drm/Makefile.am b/src/gallium/winsys/v3d/drm/Makefile.am
similarity index 100%
rename from src/gallium/winsys/vc5/drm/Makefile.am
rename to src/gallium/winsys/v3d/drm/Makefile.am
diff --git a/src/gallium/winsys/v3d/drm/Makefile.sources b/src/gallium/winsys/v3d/drm/Makefile.sources
new file mode 100644
index 0000000000..1fdeefbcbe
--- /dev/null
+++ b/src/gallium/winsys/v3d/drm/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+ v3d_drm_public.h \
+ v3d_drm_winsys.c
diff --git a/src/gallium/winsys/vc5/drm/meson.build b/src/gallium/winsys/v3d/drm/meson.build
similarity index 97%
rename from src/gallium/winsys/vc5/drm/meson.build
rename to src/gallium/winsys/v3d/drm/meson.build
index 401aff8f47..e5d7b12d1d 100644
--- a/src/gallium/winsys/vc5/drm/meson.build
+++ b/src/gallium/winsys/v3d/drm/meson.build
@@ -20,7 +20,7 @@
libv3dwinsys = static_library(
'v3dwinsys',
- files('vc5_drm_winsys.c'),
+ files('v3d_drm_winsys.c'),
include_directories : [
inc_src, inc_include,
inc_gallium, inc_gallium_aux, inc_gallium_drivers,
diff --git a/src/gallium/winsys/vc5/drm/vc5_drm_public.h b/src/gallium/winsys/v3d/drm/v3d_drm_public.h
similarity index 100%
rename from src/gallium/winsys/vc5/drm/vc5_drm_public.h
rename to src/gallium/winsys/v3d/drm/v3d_drm_public.h
diff --git a/src/gallium/winsys/vc5/drm/vc5_drm_winsys.c b/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
similarity index 95%
rename from src/gallium/winsys/vc5/drm/vc5_drm_winsys.c
rename to src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
index 9849ef4e00..63b7a5717f 100644
--- a/src/gallium/winsys/vc5/drm/vc5_drm_winsys.c
+++ b/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c
@@ -24,9 +24,9 @@
#include <unistd.h>
#include <fcntl.h>
-#include "vc5_drm_public.h"
+#include "v3d_drm_public.h"
-#include "vc5/vc5_screen.h"
+#include "v3d/v3d_screen.h"
struct pipe_screen *
v3d_drm_screen_create(int fd)
diff --git a/src/gallium/winsys/vc5/drm/Makefile.sources b/src/gallium/winsys/vc5/drm/Makefile.sources
deleted file mode 100644
index ea7566f8dc..0000000000
--- a/src/gallium/winsys/vc5/drm/Makefile.sources
+++ /dev/null
@@ -1,3 +0,0 @@
-C_SOURCES := \
- vc5_drm_public.h \
- vc5_drm_winsys.c
More information about the mesa-commit
mailing list