diff mbox

[v2] ui: egl-headless requires dmabuf support

Message ID 20170517122744.3541-1-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerd Hoffmann May 17, 2017, 12:27 p.m. UTC 
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 vl.c             | 4 ++--
 ui/Makefile.objs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Philippe Mathieu-Daudé May 17, 2017, 5:23 p.m. UTC | #1 
On 05/17/2017 09:27 AM, Gerd Hoffmann wrote:
> Reported-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  vl.c             | 4 ++--
>  ui/Makefile.objs | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 5c9b40eb1c..2d7aeec186 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -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();
>      }
> 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
>
diff mbox

Patch

diff --git a/vl.c b/vl.c
index 5c9b40eb1c..2d7aeec186 100644
--- a/vl.c
+++ b/vl.c
@@ -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();
     }
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