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
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
include Makefile.genxml.am
include Makefile.cle.am
-include Makefile.vc5.am
+include Makefile.v3d.am
CLEANFILES += $(BUILT_SOURCES)
## v3d
if HAVE_GALLIUM_V3D
-SUBDIRS += drivers/vc5 winsys/vc5/drm
+SUBDIRS += drivers/v3d winsys/v3d/drm
endif
## virgl
#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)
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
--- /dev/null
+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 \
+ $()
# 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 = []
#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 *
#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>
#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;
#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"
#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)
#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
#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;
#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)
*/
#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"
#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"
* 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
#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
#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
#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 *
#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 {
/** @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
*/
#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
#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"
*/
/* 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;
#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"
#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"
#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, \
* 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)
*/
#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"
#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)
#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"
+++ /dev/null
-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 \
- $()
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
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
--- /dev/null
+C_SOURCES := \
+ v3d_drm_public.h \
+ v3d_drm_winsys.c
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,
#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)
+++ /dev/null
-C_SOURCES := \
- vc5_drm_public.h \
- vc5_drm_winsys.c