[Mesa-dev] [PATCH 04/10] egl: Protect use of gbm_dri with ifdef HAVE_DRM_PLATFORM
Emil Velikov
emil.l.velikov at gmail.com
Fri Apr 4 03:45:46 PDT 2014
On 04/04/14 09:36, Ander Conselvan de Oliveira wrote:
> From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
>
> Otherwise it fails to compile if the drm egl platform is disabled.
Similar note to patch 2 - independent of the series, stable material.
Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
> src/egl/drivers/dri2/egl_dri2.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index 8abe8ac..a5ba048 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -2015,10 +2015,12 @@ dri2_bind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp,
> if (!dri2_dpy->wl_server_drm)
> return EGL_FALSE;
>
> +#ifdef HAVE_DRM_PLATFORM
> /* We have to share the wl_drm instance with gbm, so gbm can convert
> * wl_buffers to gbm bos. */
> if (dri2_dpy->gbm_dri)
> dri2_dpy->gbm_dri->wl_drm = dri2_dpy->wl_server_drm;
> +#endif
>
> return EGL_TRUE;
> }
>
More information about the mesa-dev
mailing list