Attachment 128575 Details for Bug 98327 – Mesa fix to query surface geometry

[patch] Mesa fix to query surface geometry

0001-egl-dri2-implement-query-surface-hook.patch (text/plain), 2.98 KB, created by Tapani Pälli on 2016-12-20 07:07:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tapani Pälli

Created: 2016-12-20 07:07:50 UTC

Size: 2.98 KB

patch

obsolete

>From de5ac9e08249449ea932cc6ab4a73ed58429ed66 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
>Date: Mon, 19 Dec 2016 11:47:47 +0200
>Subject: [PATCH] egl/dri2: implement query surface hook
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This makes better guarantee that the values we return are
>in sync what the underlying drawable currently has.
>
>Together with dEQP change bug #98327 this fixes following test:
>
>   dEQP-EGL.functional.resize.surface_size.grow
>
>Signed-off-by: Tapani PÃ¤lli <tapani.palli@intel.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98327
>---
> src/egl/drivers/dri2/platform_x11.c | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
>diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
>index db7d3b9..0c5d577 100644
>--- a/src/egl/drivers/dri2/platform_x11.c
>+++ b/src/egl/drivers/dri2/platform_x11.c
>@@ -395,6 +395,34 @@ dri2_x11_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
> }
> 
> /**
>+ * Function utilizes swrastGetDrawableInfo to get surface
>+ * geometry from x server and calls default query surface
>+ * implementation that returns the updated values.
>+ *
>+ * In case of errors we still return values that we currently
>+ * have.
>+ */
>+static EGLBoolean
>+dri2_query_surface(_EGLDriver *drv, _EGLDisplay *dpy,
>+                   _EGLSurface *surf, EGLint attribute,
>+                   EGLint *value)
>+{
>+   struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
>+   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
>+   int x, y, w = -1, h = -1;
>+
>+   __DRIdrawable *drawable = dri2_dpy->vtbl->get_dri_drawable(surf);
>+   swrastGetDrawableInfo(drawable, &x, &y, &w, &h, dri2_surf);
>+
>+   if (w != -1 && h != -1) {
>+      surf->Width = w;
>+      surf->Height = h;
>+   }
>+
>+   return _eglQuerySurface(drv, dpy, surf, attribute, value);
>+}
>+
>+/**
>  * Process list of buffer received from the server
>  *
>  * Processes the list of buffers received in a reply from the server to either
>@@ -1113,6 +1141,7 @@ static struct dri2_egl_display_vtbl dri2_x11_swrast_display_vtbl = {
>    .post_sub_buffer = dri2_fallback_post_sub_buffer,
>    .copy_buffers = dri2_x11_copy_buffers,
>    .query_buffer_age = dri2_fallback_query_buffer_age,
>+   .query_surface = dri2_query_surface,
>    .create_wayland_buffer_from_image = dri2_fallback_create_wayland_buffer_from_image,
>    .get_sync_values = dri2_fallback_get_sync_values,
>    .get_dri_drawable = dri2_surface_get_dri_drawable,
>@@ -1132,6 +1161,7 @@ static struct dri2_egl_display_vtbl dri2_x11_display_vtbl = {
>    .post_sub_buffer = dri2_x11_post_sub_buffer,
>    .copy_buffers = dri2_x11_copy_buffers,
>    .query_buffer_age = dri2_fallback_query_buffer_age,
>+   .query_surface = dri2_query_surface,
>    .create_wayland_buffer_from_image = dri2_fallback_create_wayland_buffer_from_image,
>    .get_sync_values = dri2_x11_get_sync_values,
>    .get_dri_drawable = dri2_surface_get_dri_drawable,
>-- 
>2.9.3
>

Actions: View | Splinter Review

Attachments on bug 98327: 128539 | 128540 | 128541 | 128542 | 128543 | 128575 | 128592 | 128765

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.