mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 15:53:54 -06:00
ui/console: move dcl compatiblity check to a callback
As expected from the "compatible_dcl" comment, a simple comparison of ops isn't enough. The following patch will fix a regression introduced by this limited check by extending the compatibility callback for egl-headless. For now, this patch simply replaces the the "compatible_dcl" ops pointer with a "dpy_gl_ctx_is_compatible_ctx" callback. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
398d1c91ed
commit
a62c4a178f
7 changed files with 52 additions and 14 deletions
18
ui/gtk.c
18
ui/gtk.c
|
@ -614,8 +614,15 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = {
|
|||
.dpy_has_dmabuf = gd_has_dmabuf,
|
||||
};
|
||||
|
||||
static bool
|
||||
gd_gl_area_is_compatible_dcl(DisplayGLCtx *dgc,
|
||||
DisplayChangeListener *dcl)
|
||||
{
|
||||
return dcl->ops == &dcl_gl_area_ops;
|
||||
}
|
||||
|
||||
static const DisplayGLCtxOps gl_area_ctx_ops = {
|
||||
.compatible_dcl = &dcl_gl_area_ops,
|
||||
.dpy_gl_ctx_is_compatible_dcl = gd_gl_area_is_compatible_dcl,
|
||||
.dpy_gl_ctx_create = gd_gl_area_create_context,
|
||||
.dpy_gl_ctx_destroy = gd_gl_area_destroy_context,
|
||||
.dpy_gl_ctx_make_current = gd_gl_area_make_current,
|
||||
|
@ -641,8 +648,15 @@ static const DisplayChangeListenerOps dcl_egl_ops = {
|
|||
.dpy_has_dmabuf = gd_has_dmabuf,
|
||||
};
|
||||
|
||||
static bool
|
||||
gd_egl_is_compatible_dcl(DisplayGLCtx *dgc,
|
||||
DisplayChangeListener *dcl)
|
||||
{
|
||||
return dcl->ops == &dcl_egl_ops;
|
||||
}
|
||||
|
||||
static const DisplayGLCtxOps egl_ctx_ops = {
|
||||
.compatible_dcl = &dcl_egl_ops,
|
||||
.dpy_gl_ctx_is_compatible_dcl = gd_egl_is_compatible_dcl,
|
||||
.dpy_gl_ctx_create = gd_egl_create_context,
|
||||
.dpy_gl_ctx_destroy = qemu_egl_destroy_context,
|
||||
.dpy_gl_ctx_make_current = gd_egl_make_current,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue