Mesa (master): egl/wayland: don' t modify the vtbl if an extension is not available

Emil Velikov evelikov at kemper.freedesktop.org
Mon May 29 16:02:28 UTC 2017


Module: Mesa
Branch: master
Commit: 83a792cf25e3171535a20390b0d48f33c266b852
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=83a792cf25e3171535a20390b0d48f33c266b852

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Mon May 15 16:14:16 2017 +0100

egl/wayland: don't modify the vtbl if an extension is not available

With previous commit we'll error out should one be using the extension
when it's not available. Thus we no longer need to modify the vtbl.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 src/egl/drivers/dri2/platform_wayland.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 174cfeeb7e..0014dd4a79 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1270,12 +1270,9 @@ dri2_initialize_wayland_drm(_EGLDriver *drv, _EGLDisplay *disp)
     * because the buffer of the EGLImage has likely a tiling mode the server
     * gpu won't support. These is no way to check for now. Thus do not support the
     * extension */
-   if (!dri2_dpy->is_different_gpu) {
+   if (!dri2_dpy->is_different_gpu)
       disp->Extensions.WL_create_wayland_buffer_from_image = EGL_TRUE;
-   } else {
-      dri2_wl_display_vtbl.create_wayland_buffer_from_image =
-         dri2_fallback_create_wayland_buffer_from_image;
-   }
+
    disp->Extensions.EXT_buffer_age = EGL_TRUE;
 
    disp->Extensions.EXT_swap_buffers_with_damage = EGL_TRUE;




More information about the mesa-commit mailing list