[Mesa-dev] [PATCH] egl: reinstate _eglInitDriverFallbacks() calls

Marek Olšák maraeo at gmail.com
Wed Oct 18 18:27:54 UTC 2017


Hi Emil,

I guess you can squash this into the commits I reverted.

Marek

On Wed, Oct 18, 2017 at 8:02 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> Seems that a few function pointers are initialized by the function.
> We could pick the missing ones and add them to the respective platforms.
>
> Since this brings down the Intel Jenkins CI, let's reinstate the call
> and worry about more elegant fix later.
>
> Fixes: 8cb84c8477a ("egl: move alloc & init out of
> _eglBuiltInDriver{DRI2,Haiku}")
> Cc: Eric Engestrom <eric at engestrom.ch>
> Cc: Mark Janes <mark.a.janes at intel.com>
> Reported-by: Mark Janes <mark.a.janes at intel.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/egl/drivers/dri2/egl_dri2.c     | 1 +
>  src/egl/drivers/haiku/egl_haiku.cpp | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index f9fc71e51bf..f7ed6d14365 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -3196,6 +3196,7 @@ dri2_interop_export_object(_EGLDisplay *dpy, _EGLContext *ctx,
>  void
>  _eglInitDriver(_EGLDriver *dri2_drv)
>  {
> +   _eglInitDriverFallbacks(dri2_drv);
>     dri2_drv->API.Initialize = dri2_initialize;
>     dri2_drv->API.Terminate = dri2_terminate;
>     dri2_drv->API.CreateContext = dri2_create_context;
> diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
> index 0b56653395a..a3f20c2d828 100644
> --- a/src/egl/drivers/haiku/egl_haiku.cpp
> +++ b/src/egl/drivers/haiku/egl_haiku.cpp
> @@ -313,6 +313,7 @@ _eglInitDriver(_EGLDriver *driver)
>  {
>         CALLED();
>
> +       _eglInitDriverFallbacks(driver);
>         driver->API.Initialize = init_haiku;
>         driver->API.Terminate = haiku_terminate;
>         driver->API.CreateContext = haiku_create_context;
> --
> 2.14.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list