summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2015-03-23 10:20:15 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2015-03-24 10:59:12 +0100
commitb6c80f7d3c41eb214d937c71ace184c4646fbcd7 (patch)
treef0264ca6222cc351c79dc44cdc5f02db0145d5bb
parentd35ed31d61869b93a43bfb1e5f388e3543b70397 (diff)
compositor-{drm,wayland,x11}: remove useless tests for ->supports
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r--src/compositor-drm.c3
-rw-r--r--src/compositor-wayland.c3
-rw-r--r--src/compositor-x11.c2
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,