diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2015-05-15 12:12:39 -0500 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-05-18 11:51:45 +0300 |
| commit | e76f185050e86116ad03fdc0119505dd8c3b367a (patch) | |
| tree | 27c1ae3ca7d554e9a94c3dea79e1b16e9dd549a5 /src/compositor-wayland.c | |
| parent | b33877a9cc31120e77a85c58bc7a62708c3a19dc (diff) | |
| download | weston-e76f185050e86116ad03fdc0119505dd8c3b367a.tar.gz | |
gl-renderer: Take a list of acceptable formats in create functions
Currently we pass either a single format or no formats to the gl renderer
create and output_create functions. We extend this to any number of
formats so we can allow fallback formats if we don't get our first pick.
Reviewed-By: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-By: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Diffstat (limited to 'src/compositor-wayland.c')
| -rw-r--r-- | src/compositor-wayland.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 303151c4..c9983e01 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -648,7 +648,8 @@ wayland_output_init_gl_renderer(struct wayland_output *output) output->gl.egl_window, output->gl.egl_window, gl_renderer->alpha_attribs, - NULL) < 0) + NULL, + 0) < 0) goto cleanup_window; return 0; @@ -1970,10 +1971,11 @@ wayland_compositor_create(struct wl_display *display, int use_pixman, if (!c->use_pixman) { if (gl_renderer->create(&c->base, - EGL_PLATFORM_WAYLAND_KHR, - c->parent.wl_display, - gl_renderer->alpha_attribs, - NULL) < 0) { + EGL_PLATFORM_WAYLAND_KHR, + c->parent.wl_display, + gl_renderer->alpha_attribs, + NULL, + 0) < 0) { weston_log("Failed to initialize the GL renderer; " "falling back to pixman.\n"); c->use_pixman = 1; |