[PATCH xserver 1/2] glamor: Call eglBindAPI after eglInitialize

[Marek Olšák]

Not anymore. I reverted the Mesa commit. We need to keep old Glamor in
a working state.

Marek

On Fri, Jun 3, 2016 at 3:25 AM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Current Mesa Git master checks that the EGL display actually supports
> the API passed to eglBindAPI, which can only succeed after
> eglInitialize.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96344
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
> ---
>  glamor/glamor_egl.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
> index 4bcd3ce..16a20a7 100644
> --- a/glamor/glamor_egl.c
> +++ b/glamor/glamor_egl.c
> @@ -770,11 +770,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
>
>      glamor_egl->has_gem = glamor_egl_check_has_gem(fd);
>
> -#ifndef GLAMOR_GLES2
> -    eglBindAPI(EGL_OPENGL_API);
> -#else
> -    eglBindAPI(EGL_OPENGL_ES_API);
> -#endif
>      if (!eglInitialize
>          (glamor_egl->display, &glamor_egl->major, &glamor_egl->minor)) {
>          xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n");
> @@ -782,6 +777,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
>          goto error;
>      }
>
> +#ifndef GLAMOR_GLES2
> +    eglBindAPI(EGL_OPENGL_API);
> +#else
> +    eglBindAPI(EGL_OPENGL_ES_API);
> +#endif
> +
>      version = eglQueryString(glamor_egl->display, EGL_VERSION);
>      xf86Msg(X_INFO, "%s: EGL version %s:\n", glamor_name, version);
>
> --
> 2.8.1
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel