gl-renderer: conditionally call query_buffer while gl_renderer_attach
authorVincent Abriou <vincent.abriou@st.com>
Thu, 3 Nov 2016 10:15:32 +0000 (11:15 +0100)
committerDaniel Stone <daniels@collabora.com>
Thu, 3 Nov 2016 21:23:05 +0000 (21:23 +0000)
While gl_renderer_attach, query_buffer should be call only if the
query_buffer function exists ie when has_bind_display is true.

v2:
 - Take into account Giulio's remark. Use has_bind_display viariable to test if
   EGL_WL_bind_wayland_display extension is supported.

Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
libweston/gl-renderer.c

index 9747de5..3e8e5ab 100644 (file)
@@ -2004,7 +2004,8 @@ gl_renderer_attach(struct weston_surface *es, struct weston_buffer *buffer)
 
        if (shm_buffer)
                gl_renderer_attach_shm(es, buffer, shm_buffer);
-       else if (gr->query_buffer(gr->egl_display, (void *) buffer->resource,
+       else if (gr->has_bind_display &&
+                gr->query_buffer(gr->egl_display, (void *)buffer->resource,
                                  EGL_TEXTURE_FORMAT, &format))
                gl_renderer_attach_egl(es, buffer, format);
        else if ((dmabuf = linux_dmabuf_buffer_get(buffer->resource)))