gl-renderer: remove platform_attribs

No caller ever used anything but NULL here, so just use NULL to simplify code.

In fact, no EGL platform defined today even defines any platform attributes
except the X11 platform for choosing a non-default SCREEN.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>

diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
index ebb56c405bc4ac72d7766801cdbee0705fb9167a..dc092e61184a1c174a410ba18f4406b15aaf98a6 100644 (file)
--- a/libweston/backend-drm/drm.c
+++ b/libweston/backend-drm/drm.c
@@ -748,7 +748,6 @@ drm_backend_create_gl_renderer(struct drm_backend *b)
        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/backend-wayland/wayland.c b/libweston/backend-wayland/wayland.c
index dd4c1cca0a72a6898088f4b272039321d8038091..9c76f2b30b09ff455121a2b0744cfd69813a812d 100644 (file)
--- a/libweston/backend-wayland/wayland.c
+++ b/libweston/backend-wayland/wayland.c
@@ -2769,7 +2769,6 @@ wayland_backend_create(struct weston_compositor *compositor,
                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/backend-x11/x11.c b/libweston/backend-x11/x11.c
index e6227737022533b312ccd69a4e1974bd5cf4b053..9f58ed417fcbb628fc9a5d2d8eaa3857833501a5 100644 (file)
--- a/libweston/backend-x11/x11.c
+++ b/libweston/backend-x11/x11.c
@@ -1809,7 +1809,7 @@ init_gl_renderer(struct x11_backend *b)
                return -1;
 
        ret = gl_renderer->display_create(b->compositor, EGL_PLATFORM_X11_KHR,
-                                         (void *) b->dpy, NULL,
+                                         (void *) b->dpy,
                                          gl_renderer->opaque_attribs, NULL, 0);
 
        return ret;

diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
index 95348cda6222f5b37cdea48c6ae14b5d93c6d2cb..e12c9f8b013284c343f08bb032c6e04b40a11088 100644 (file)
--- a/libweston/renderer-gl/gl-renderer.c
+++ b/libweston/renderer-gl/gl-renderer.c
@@ -3752,7 +3752,6 @@ static int
 gl_renderer_display_create(struct weston_compositor *ec,
                           EGLenum platform,
                           void *native_display,
-                          const EGLint *platform_attribs,
                           const EGLint *config_attribs,
                           const EGLint *visual_id,
                           int n_ids)
@@ -3797,7 +3796,7 @@ gl_renderer_display_create(struct weston_compositor *ec,
                if (get_platform_display && platform) {
                        gr->egl_display = get_platform_display(platform,
                                                               native_display,
-                                                              platform_attribs);
+                                                              NULL);
                }
        }
 

diff --git a/libweston/renderer-gl/gl-renderer.h b/libweston/renderer-gl/gl-renderer.h
index 784da92a7bf72868dbb95797c6b3001298eb48fe..f58b5ac3c21ce3d7d5b42d27b45bd00bcce8e946 100644 (file)
--- a/libweston/renderer-gl/gl-renderer.h
+++ b/libweston/renderer-gl/gl-renderer.h
@@ -63,7 +63,6 @@ struct gl_renderer_interface {
        int (*display_create)(struct weston_compositor *ec,
                              EGLenum platform,
                              void *native_display,
-                             const EGLint *platform_attribs,
                              const EGLint *config_attribs,
                              const EGLint *visual_id,
                              const int n_ids);