Mesa (staging/18.2): wayland/egl: initialize window surface size to window size

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: 9ad14f71e6000249affc8e991db878e0e9e1ba19
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ad14f71e6000249affc8e991db878e0e9e1ba19

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Mon Jun  4 10:22:49 2018 +0000

wayland/egl: initialize window surface size to window size

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>
Tested-by: Chad Versace <chadversary at chromium.org>
Reviewed-by: Chad Versace <chadversary at chromium.org>
Reviewed-by: Daniel Stone <daniels at collabora.com>
(cherry picked from commit 1fe7cbdf05b90034577dac4e4aa6157031d80521)

---

 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 dca099500a..a5d43094cf 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);