gl-renderer: Add <platform_attribs> param to gl_renderer_display_create
This change adds <platform_attribs> parameter to
gl_renderer_display_create() in case we ever want to pass non-NULL.
Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Reviewed-by: James Jones <jajones@nvidia.com>
[Pekka: removed notes about EGLOutput]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 41ad9de..a899213 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -1572,6 +1572,7 @@
if (gl_renderer->display_create(b->compositor,
EGL_PLATFORM_GBM_KHR,
(void *)b->gbm,
+ NULL,
gl_renderer->opaque_attribs,
format,
n_formats) < 0) {
diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index 1a46c4e..c6ac5fe 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -2352,6 +2352,7 @@
if (gl_renderer->display_create(compositor,
EGL_PLATFORM_WAYLAND_KHR,
b->parent.wl_display,
+ NULL,
gl_renderer->alpha_attribs,
NULL,
0) < 0) {
diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
index 0804591..ea77f31 100644
--- a/libweston/compositor-x11.c
+++ b/libweston/compositor-x11.c
@@ -1647,7 +1647,7 @@
return -1;
ret = gl_renderer->display_create(b->compositor, EGL_PLATFORM_X11_KHR,
- (void *) b->dpy,
+ (void *) b->dpy, NULL,
gl_renderer->opaque_attribs, NULL, 0);
return ret;
diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index 1463de1..cf8df08 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -2990,8 +2990,8 @@
static int
gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform,
- void *native_window, const EGLint *config_attribs,
- const EGLint *visual_id, int n_ids)
+ void *native_window, const EGLint *platform_attribs,
+ const EGLint *config_attribs, const EGLint *visual_id, int n_ids)
{
struct gl_renderer *gr;
EGLint major, minor;
@@ -3033,7 +3033,7 @@
if (get_platform_display && platform) {
gr->egl_display = get_platform_display(platform,
native_window,
- NULL);
+ platform_attribs);
}
}
diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h
index 1835d25..b47ea07 100644
--- a/libweston/gl-renderer.h
+++ b/libweston/gl-renderer.h
@@ -63,6 +63,7 @@
int (*display_create)(struct weston_compositor *ec,
EGLenum platform,
void *native_window,
+ const EGLint *platform_attribs,
const EGLint *config_attribs,
const EGLint *visual_id,
const int n_ids);