On 25 September 2015 at 23:49, Marek Olšák <mar...@gmail.com> wrote:
> From: Marek Olšák <marek.ol...@amd.com>
>
> The spec doesn't require it. This fixes a crash on Android.
>
> Cc: 10.6 11.0 <mesa-sta...@lists.freedesktop.org>
> ---
> src/egl/drivers/dri2/egl_dri2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index 1740ee3..7d8977e 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -2430,7 +2430,7 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay
> *dpy, _EGLSync *sync,
> /* the sync object should take a reference while waiting */
> dri2_egl_ref_sync(dri2_sync);
>
> - if (dri2_dpy->fence->client_wait_sync(dri2_ctx->dri_context,
> + if (dri2_dpy->fence->client_wait_sync(dri2_ctx ? dri2_ctx->dri_context :
> NULL,
> dri2_sync->fence, wait_flags,
> timeout))
> dri2_sync->base.SyncStatus = EGL_SIGNALED_KHR;
> --
> 2.1.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Reviewed-by: Albert Freeman <albertwdfree...@gmail.com>
Can easily be reverted later if a better solution is found. :)
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
