[Mesa-stable] [Mesa-dev] [PATCH] egl: Check config's surface types in eglCreate*Surface()

[Tapani Pälli]

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 12/17/2016 03:59 AM, Chad Versace wrote:
> If the provided EGLConfig does not support the requested surface type,
> then emit EGL_BAD_MATCH.
>
> Fixes dEQP-EGL.functional.negative_api.create_pbuffer_surface
> on GBM.
>
> Cc: "13.0" <mesa-stable at lists.freedesktop.org>
> ---
>  src/egl/main/eglapi.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
> index a349992c46..cab05c2301 100644
> --- a/src/egl/main/eglapi.c
> +++ b/src/egl/main/eglapi.c
> @@ -875,6 +875,9 @@ _eglCreateWindowSurfaceCommon(_EGLDisplay *disp, EGLConfig config,
>
>     _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE, drv);
>
> +   if ((conf->SurfaceType & EGL_WINDOW_BIT) == 0)
> +      RETURN_EGL_ERROR(disp, EGL_BAD_MATCH, EGL_NO_SURFACE);
> +
>     surf = drv->API.CreateWindowSurface(drv, disp, conf, native_window,
>                                         attrib_list);
>     ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE;
> @@ -993,6 +996,10 @@ _eglCreatePixmapSurfaceCommon(_EGLDisplay *disp, EGLConfig config,
>  #endif
>
>     _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE, drv);
> +
> +   if ((conf->SurfaceType & EGL_PIXMAP_BIT) == 0)
> +      RETURN_EGL_ERROR(disp, EGL_BAD_MATCH, EGL_NO_SURFACE);
> +
>     surf = drv->API.CreatePixmapSurface(drv, disp, conf, native_pixmap,
>                                         attrib_list);
>     ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE;
> @@ -1063,6 +1070,9 @@ eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config,
>     _EGL_FUNC_START(disp, EGL_OBJECT_DISPLAY_KHR, NULL, EGL_NO_SURFACE);
>     _EGL_CHECK_CONFIG(disp, conf, EGL_NO_SURFACE, drv);
>
> +   if ((conf->SurfaceType & EGL_PBUFFER_BIT) == 0)
> +      RETURN_EGL_ERROR(disp, EGL_BAD_MATCH, EGL_NO_SURFACE);
> +
>     surf = drv->API.CreatePbufferSurface(drv, disp, conf, attrib_list);
>     ret = (surf) ? _eglLinkSurface(surf) : EGL_NO_SURFACE;
>
>