From c4c488a2aeb24c0f468664c0cacd0d01111a4e46 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 25 Aug 2017 15:34:22 -0700 Subject: v3d: Rename the vc5_dri.so driver to v3d_dri.so. This allows the driver to load against the merged kernel DRM driver. In the process, rename most of the build system variables and gallium plumbing functions. --- src/gallium/auxiliary/target-helpers/drm_helper.h | 10 +++++----- src/gallium/auxiliary/target-helpers/drm_helper_public.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gallium/auxiliary/target-helpers') diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h index 7dc2497c087..c494848888d 100644 --- a/src/gallium/auxiliary/target-helpers/drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/drm_helper.h @@ -310,24 +310,24 @@ pipe_vc4_create_screen(int fd, const struct pipe_screen_config *config) #endif -#ifdef GALLIUM_VC5 +#ifdef GALLIUM_V3D #include "vc5/drm/vc5_drm_public.h" struct pipe_screen * -pipe_vc5_create_screen(int fd, const struct pipe_screen_config *config) +pipe_v3d_create_screen(int fd, const struct pipe_screen_config *config) { struct pipe_screen *screen; - screen = vc5_drm_screen_create(fd); + screen = v3d_drm_screen_create(fd); return screen ? debug_screen_wrap(screen) : NULL; } #else struct pipe_screen * -pipe_vc5_create_screen(int fd, const struct pipe_screen_config *config) +pipe_v3d_create_screen(int fd, const struct pipe_screen_config *config) { - fprintf(stderr, "vc5: driver missing\n"); + fprintf(stderr, "v3d: driver missing\n"); return NULL; } diff --git a/src/gallium/auxiliary/target-helpers/drm_helper_public.h b/src/gallium/auxiliary/target-helpers/drm_helper_public.h index c1a7bf4e252..155c525762c 100644 --- a/src/gallium/auxiliary/target-helpers/drm_helper_public.h +++ b/src/gallium/auxiliary/target-helpers/drm_helper_public.h @@ -37,10 +37,10 @@ struct pipe_screen * pipe_virgl_create_screen(int fd, const struct pipe_screen_config *config); struct pipe_screen * -pipe_vc4_create_screen(int fd, const struct pipe_screen_config *config); +pipe_v3d_create_screen(int fd, const struct pipe_screen_config *config); struct pipe_screen * -pipe_vc5_create_screen(int fd, const struct pipe_screen_config *config); +pipe_vc4_create_screen(int fd, const struct pipe_screen_config *config); struct pipe_screen * pipe_pl111_create_screen(int fd, const struct pipe_screen_config *config); -- cgit v1.2.3