system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-09-06 18:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

gl-renderer: Move EGL client extension handling earlier

Browse source 
EGL client extensions are not tied to the EGLDisplay we create, and have
an effect on how we create the EGLDisplay. Since we're using this to
look for EGL_EXT_platform_base, it makes more sense for this to be near
the start of the GL renderer initialization.

Signed-off-by: Scott Anderson <scott.anderson@collabora.com>
This commit is contained in:
Scott Anderson 2019-12-20 14:28:44 +13:00
parent 598d3a15b7
commit dddb592cfb
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libweston/renderer-gl/egl-glue.c
View file

@ -455,8 +455,8 @@ gl_renderer_get_egl_config(struct gl_renderer *gr,
return egl_config;
}
static void
renderer_setup_egl_client_extensions(struct gl_renderer *gr)
void
gl_renderer_setup_egl_client_extensions(struct gl_renderer *gr)
{
const char *extensions;
@ -593,7 +593,5 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec)
"to missing EGL_KHR_wait_sync extension\n");
}
renderer_setup_egl_client_extensions(gr);
return 0;
}

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

@ -135,6 +135,9 @@ gl_renderer_get_egl_config(struct gl_renderer *gr,
const uint32_t *drm_formats,
unsigned drm_formats_count);
void
gl_renderer_setup_egl_client_extensions(struct gl_renderer *gr);
int
gl_renderer_setup_egl_extensions(struct weston_compositor *ec);

2
libweston/renderer-gl/gl-renderer.c
View file

@ -3480,6 +3480,8 @@ gl_renderer_display_create(struct weston_compositor *ec,
if (gr == NULL)
return -1;
gl_renderer_setup_egl_client_extensions(gr);
gr->base.read_pixels = gl_renderer_read_pixels;
gr->base.repaint_output = gl_renderer_repaint_output;
gr->base.flush_damage = gl_renderer_flush_damage;