[Mesa-dev] [Mesa-stable] [PATCH v4 1/2] wayland/egl: initialize window surface size to window size

[Eric Engestrom]

On Thursday, 2018-08-09 09:03:02 -0700, Dylan Baker wrote:
> Quoting Juan A. Suarez Romero (2018-08-07 08:49:36)
> > When creating a windows surface with eglCreateWindowSurface(), the
> > width and height returned by eglQuerySurface(EGL_{WIDTH,HEIGHT}) is
> > invalid until buffers are updated (like calling glClear()).
> > 
> > But according to EGL 1.5 spec, section 3.5.6 ("Surface Attributes"):
> > 
> >   "Querying EGL_WIDTH and EGL_HEIGHT returns respectively the width and
> >    height, in pixels, of the surface. For a window or pixmap surface,
> >    these values are initially equal to the width and height of the
> >    native window or pixmap with respect to which the surface was
> >    created"
> > 
> > This fixes dEQP-EGL.functional.color_clears.* CTS tests
> > 
> > v2:
> > - Do not modify attached_{width,height} (Daniel)
> > - Do not update size on resizing window (Brendan)
> > 
> > CC: Daniel Stone <daniel at fooishbar.org>
> > CC: Brendan King <brendan.king at imgtec.com>
> > CC: mesa-stable at lists.freedesktop.org
> > Tested-by: Eric Engestrom <eric at engestrom.ch>
> > ---
> >  src/egl/drivers/dri2/platform_wayland.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
> > index dca099500a8..a5d43094cf3 100644
> > --- a/src/egl/drivers/dri2/platform_wayland.c
> > +++ b/src/egl/drivers/dri2/platform_wayland.c
> > @@ -258,6 +258,9 @@ dri2_wl_create_window_surface(_EGLDriver *drv, _EGLDisplay *disp,
> >        goto cleanup_surf;
> >     }
> >  
> > +   dri2_surf->base.Width = window->width;
> > +   dri2_surf->base.Height = window->height;
> > +
> >     visual_idx = dri2_wl_visual_idx_from_config(dri2_dpy, config);
> >     assert(visual_idx != -1);
> >  
> > -- 
> > 2.17.1
> > 
> 
> Hi Juan,
> 
> There was a minor conflict when I pulled this into staging/18.1, I'm pretty
> confident that I resolved it correctly, but if you wouldn't mind taking a look
> I'd appreciate it.

For easier lookup, the 18.1 commit is 4395919bd95501a13ba2, and the
rebase looks correct to me too :)

> 
> Thanks,
> Dylan