diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-19 16:44:18 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-19 16:44:26 +0100 |
| commit | a4657d4b918f9a7c655620c90d135fe34e7293ee (patch) | |
| tree | 1d209982b740e681fc8485051bb7a6f482167e20 | |
| parent | 14c1f7deb43ec0e1a7f2eabfe652bfad1124392d (diff) | |
| parent | 371ec54e9f8415cd74af45acdcf67b413f50cce5 (diff) | |
Merge remote-tracking branch 'kraxel/tags/pull-ui-20170519-1' into staging
ui: egl-headless requires dmabuf support
# gpg: Signature made Fri 19 May 2017 09:46:40 AM BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* kraxel/tags/pull-ui-20170519-1:
ui: egl-headless requires dmabuf support
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | ui/Makefile.objs | 2 | ||||
| -rw-r--r-- | vl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/Makefile.objs b/ui/Makefile.objs index aac6ae8bef..3369451285 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -33,7 +33,7 @@ common-obj-y += shader.o common-obj-y += console-gl.o common-obj-y += egl-helpers.o common-obj-y += egl-context.o -common-obj-y += egl-headless.o +common-obj-$(CONFIG_OPENGL_DMABUF) += egl-headless.o ifeq ($(CONFIG_GTK_GL),y) common-obj-$(CONFIG_GTK) += gtk-gl-area.o else @@ -2129,7 +2129,7 @@ static DisplayType select_display(const char *p) exit(1); } } else if (strstart(p, "egl-headless", &opts)) { -#ifdef CONFIG_OPENGL +#ifdef CONFIG_OPENGL_DMABUF request_opengl = 1; display_opengl = 1; display = DT_EGL; @@ -4668,7 +4668,7 @@ int main(int argc, char **argv, char **envp) qemu_spice_display_init(); } -#ifdef CONFIG_OPENGL +#ifdef CONFIG_OPENGL_DMABUF if (display_type == DT_EGL) { egl_headless_init(); } |