[Mesa-stable] [PATCH v2] egl: stop claiming support for pbuffer + msaa

[Emil Velikov]

On 30 September 2016 at 07:32, Tapani Pälli <tapani.palli at intel.com> wrote:
> This fixes a crash in egl-create-msaa-pbuffer-surface Piglit test
> and same crash in many dEQP EGL tests.
>
> I also found that some Qt example did a workaround because of this
> crash: https://bugreports.qt.io/browse/QTBUG-47509
>
> v2: Ian pointed out that v1 removed support for all multisample
>     configs, including window ones. This one removes pbuffer bit
>     when adding configs, now only pbuffer+msaa gets rejected and
>     window+msaa continues to work. Fixed also comment (Emil)
>
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> Cc: mesa-stable at lists.freedesktop.org
> ---
>  src/egl/drivers/dri2/egl_dri2.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index 8e376e3..803627d 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -320,6 +320,15 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
>        surface_type &= ~EGL_PIXMAP_BIT;
>     }
>
> +   /* No support for pbuffer + MSAA for now.
> +    *
> +    * XXX TODO: pbuffer + MSAA does not work and causes crashes.
> +    * See QT bugreport: https://bugreports.qt.io/browse/QTBUG-47509
> +    */
> +   if (base.Samples) {
> +      surface_type &= ~EGL_PBUFFER_BIT;
> +   }
> +
I'm slightly cautious if this won't cause unexpected side effects (due
to _eglFilterArray() and/or other interaction), so let's have this
soak in master for a bit before picking to stable.

That aside the patch is (for real this time)
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

Before pushing please double-check that piglit/deqp/cts doesn't get upset.

Thanks
Emil