From ace6920912bb96818960f411175de8b52b6b69ce Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 24 Mar 2015 13:12:03 +0100 Subject: [PATCH] compositor-{drm, wayland, x11}: remove useless tests for ->supports Reviewed-by: Pekka Paalanen --- src/compositor-drm.c | 3 +-- src/compositor-wayland.c | 3 +-- src/compositor-x11.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/compositor-drm.c b/src/compositor-drm.c index 158929f0..9e42a8b4 100644 --- a/src/compositor-drm.c +++ b/src/compositor-drm.c @@ -1396,8 +1396,7 @@ drm_compositor_create_gl_renderer(struct drm_compositor *ec) { EGLint format; - if (!gl_renderer->supports || - gl_renderer->supports(&ec->base, "gbm") < 0) { + if (gl_renderer->supports(&ec->base, "gbm") < 0) { return -1; } diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 9b851b75..ca747c40 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -1962,8 +1962,7 @@ wayland_compositor_create(struct wl_display *display, int use_pixman, } if (!c->use_pixman) { - if (!gl_renderer->supports || - gl_renderer->supports(&c->base, "wayland") < 0) { + if (gl_renderer->supports(&c->base, "wayland") < 0) { weston_log("No support for " "EGL_{KHR,EXT,MESA}_platform_wayland; " "falling back to pixman.\n"); diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 3ef446cf..731b37c2 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -1492,7 +1492,7 @@ init_gl_renderer(struct x11_compositor *c) if (!gl_renderer) return -1; - if (!gl_renderer->supports || gl_renderer->supports(&c->base, "x11") < 0) + if (gl_renderer->supports(&c->base, "x11") < 0) return -1; ret = gl_renderer->create(&c->base, EGL_PLATFORM_X11_KHR, (void *) c->dpy,