Commit 41700e35 authored by Miguel A. Vico's avatar Miguel A. Vico Committed by Pekka Paalanen

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: default avatarMiguel A Vico Moya <mvicomoya@nvidia.com>
Reviewed-by: default avatarAndy Ritger <aritger@nvidia.com>
Reviewed-by: James Jones's avatarJames Jones <jajones@nvidia.com>
[Pekka: removed notes about EGLOutput]
Signed-off-by: Pekka Paalanen's avatarPekka Paalanen <pekka.paalanen@collabora.co.uk>
parent 684c9f49
...@@ -1572,6 +1572,7 @@ drm_backend_create_gl_renderer(struct drm_backend *b) ...@@ -1572,6 +1572,7 @@ drm_backend_create_gl_renderer(struct drm_backend *b)
if (gl_renderer->display_create(b->compositor, if (gl_renderer->display_create(b->compositor,
EGL_PLATFORM_GBM_KHR, EGL_PLATFORM_GBM_KHR,
(void *)b->gbm, (void *)b->gbm,
NULL,
gl_renderer->opaque_attribs, gl_renderer->opaque_attribs,
format, format,
n_formats) < 0) { n_formats) < 0) {
......
...@@ -2352,6 +2352,7 @@ wayland_backend_create(struct weston_compositor *compositor, ...@@ -2352,6 +2352,7 @@ wayland_backend_create(struct weston_compositor *compositor,
if (gl_renderer->display_create(compositor, if (gl_renderer->display_create(compositor,
EGL_PLATFORM_WAYLAND_KHR, EGL_PLATFORM_WAYLAND_KHR,
b->parent.wl_display, b->parent.wl_display,
NULL,
gl_renderer->alpha_attribs, gl_renderer->alpha_attribs,
NULL, NULL,
0) < 0) { 0) < 0) {
......
...@@ -1647,7 +1647,7 @@ init_gl_renderer(struct x11_backend *b) ...@@ -1647,7 +1647,7 @@ init_gl_renderer(struct x11_backend *b)
return -1; return -1;
ret = gl_renderer->display_create(b->compositor, EGL_PLATFORM_X11_KHR, ret = gl_renderer->display_create(b->compositor, EGL_PLATFORM_X11_KHR,
(void *) b->dpy, (void *) b->dpy, NULL,
gl_renderer->opaque_attribs, NULL, 0); gl_renderer->opaque_attribs, NULL, 0);
return ret; return ret;
......
...@@ -2990,8 +2990,8 @@ gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) { ...@@ -2990,8 +2990,8 @@ gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) {
static int static int
gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform,
void *native_window, const EGLint *config_attribs, void *native_window, const EGLint *platform_attribs,
const EGLint *visual_id, int n_ids) const EGLint *config_attribs, const EGLint *visual_id, int n_ids)
{ {
struct gl_renderer *gr; struct gl_renderer *gr;
EGLint major, minor; EGLint major, minor;
...@@ -3033,7 +3033,7 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, ...@@ -3033,7 +3033,7 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform,
if (get_platform_display && platform) { if (get_platform_display && platform) {
gr->egl_display = get_platform_display(platform, gr->egl_display = get_platform_display(platform,
native_window, native_window,
NULL); platform_attribs);
} }
} }
......
...@@ -63,6 +63,7 @@ struct gl_renderer_interface { ...@@ -63,6 +63,7 @@ struct gl_renderer_interface {
int (*display_create)(struct weston_compositor *ec, int (*display_create)(struct weston_compositor *ec,
EGLenum platform, EGLenum platform,
void *native_window, void *native_window,
const EGLint *platform_attribs,
const EGLint *config_attribs, const EGLint *config_attribs,
const EGLint *visual_id, const EGLint *visual_id,
const int n_ids); const int n_ids);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment