mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gl-renderer: Move EGL display creation to egl-glue.c 

It makes more sense for it to be there instead.

Signed-off-by: Scott Anderson <scott.anderson@collabora.com>
This commit is contained in:
Scott Anderson 2019-12-20 15:07:43 +13:00
parent 4ed58b1d47
commit 4ed62d47cc
3 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libweston/renderer-gl/egl-glue.c
View File

@ -455,6 +455,42 @@ gl_renderer_get_egl_config(struct gl_renderer *gr,
return egl_config; return egl_config;
} }
int
gl_renderer_setup_egl_display(struct gl_renderer *gr,
void *native_display)
{
gr->egl_display = NULL;
/* extension_suffix is supported */
if (gr->has_platform_base)
gr->egl_display = gr->get_platform_display(gr->platform,
native_display,
NULL);
if (!gr->egl_display) {
weston_log("warning: either no EGL_EXT_platform_base "
"support or specific platform support; "
"falling back to eglGetDisplay.\n");
gr->egl_display = eglGetDisplay(native_display);
}
if (!gr->egl_display) {
weston_log("failed to create display\n");
return -1;
}
if (!eglInitialize(gr->egl_display, NULL, NULL)) {
weston_log("failed to initialize display\n");
goto fail;
}
return 0;
fail:
gl_renderer_print_egl_error_state();
return -1;
}
static const char * static const char *
platform_to_extension(EGLenum platform) platform_to_extension(EGLenum platform)
{ {

3
libweston/renderer-gl/gl-renderer-internal.h
View File

@ -141,6 +141,9 @@ gl_renderer_get_egl_config(struct gl_renderer *gr,
const uint32_t *drm_formats, const uint32_t *drm_formats,
unsigned drm_formats_count); unsigned drm_formats_count);
int
gl_renderer_setup_egl_display(struct gl_renderer *gr, void *native_display);
int int
gl_renderer_setup_egl_client_extensions(struct gl_renderer *gr); gl_renderer_setup_egl_client_extensions(struct gl_renderer *gr);

24
libweston/renderer-gl/gl-renderer.c
View File

@ -3381,7 +3381,6 @@ gl_renderer_display_create(struct weston_compositor *ec,
unsigned drm_formats_count) unsigned drm_formats_count)
{ {
struct gl_renderer *gr; struct gl_renderer *gr;
EGLint major, minor;
gr = zalloc(sizeof *gr); gr = zalloc(sizeof *gr);
if (gr == NULL) if (gr == NULL)
@ -3401,30 +3400,9 @@ gl_renderer_display_create(struct weston_compositor *ec,
gr->base.surface_get_content_size = gr->base.surface_get_content_size =
gl_renderer_surface_get_content_size; gl_renderer_surface_get_content_size;
gr->base.surface_copy_content = gl_renderer_surface_copy_content; gr->base.surface_copy_content = gl_renderer_surface_copy_content;
gr->egl_display = NULL;
/* extension_suffix is supported */ if (gl_renderer_setup_egl_display(gr, native_display) < 0)
if (gr->has_platform_base)
gr->egl_display = gr->get_platform_display(platform,
native_display,
NULL);
if (!gr->egl_display) {
weston_log("warning: either no EGL_EXT_platform_base "
"support or specific platform support; "
"falling back to eglGetDisplay.\n");
gr->egl_display = eglGetDisplay(native_display);
}
if (!gr->egl_display) {
weston_log("failed to create display\n");
goto fail; goto fail;
}
if (!eglInitialize(gr->egl_display, &major, &minor)) {
weston_log("failed to initialize display\n");
goto fail_with_error;
}
log_egl_info(gr->egl_display); log_egl_info(gr->egl_display);