diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/auxiliary/meson.build | 6 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys.h | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index e76b2ac912e..1b8d32d128b 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -479,7 +479,8 @@ files_libgalliumvl = files( ) vlwinsys_deps = [] -files_libgalliumvlwinsys = files('vl/vl_winsys.h') +files_libgalliumvlwinsys = files('vl/vl_winsys.h', + 'vl/vl_winsys_drm.c') if with_dri2 and with_platform_x11 files_libgalliumvlwinsys += files('vl/vl_winsys_dri.c') if with_dri3 @@ -490,9 +491,6 @@ if with_dri2 and with_platform_x11 files_libgalliumvlwinsys += files('vl/vl_winsys_dri3.c') endif endif -if with_platform_drm - files_libgalliumvlwinsys += files('vl/vl_winsys_drm.c') -endif u_indices_gen_c = custom_target( 'u_indices_gen.c', diff --git a/src/gallium/auxiliary/vl/vl_winsys.h b/src/gallium/auxiliary/vl/vl_winsys.h index 3a35cb6a859..a12b08bcf7e 100644 --- a/src/gallium/auxiliary/vl/vl_winsys.h +++ b/src/gallium/auxiliary/vl/vl_winsys.h @@ -92,12 +92,8 @@ static inline struct vl_screen * vl_dri3_screen_create(void *display, int screen) { return NULL; }; #endif -#ifdef HAVE_DRM_PLATFORM +/* Always enable the DRM vl winsys */ struct vl_screen * vl_drm_screen_create(int fd); -#else -static inline struct vl_screen * -vl_drm_screen_create(int fd) { return NULL; }; -#endif #endif |