瀏覽代碼

ui: egl-headless requires dmabuf support

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20170517122744.3541-1-kraxel@redhat.com
Gerd Hoffmann 8 年之前
父節點
當前提交
371ec54e9f
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      ui/Makefile.objs
  2. 2 2
      vl.c

+ 1 - 1
ui/Makefile.objs

@@ -33,7 +33,7 @@ common-obj-y += shader.o
 common-obj-y += console-gl.o
 common-obj-y += console-gl.o
 common-obj-y += egl-helpers.o
 common-obj-y += egl-helpers.o
 common-obj-y += egl-context.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)
 ifeq ($(CONFIG_GTK_GL),y)
 common-obj-$(CONFIG_GTK) += gtk-gl-area.o
 common-obj-$(CONFIG_GTK) += gtk-gl-area.o
 else
 else

+ 2 - 2
vl.c

@@ -2129,7 +2129,7 @@ static DisplayType select_display(const char *p)
             exit(1);
             exit(1);
         }
         }
     } else if (strstart(p, "egl-headless", &opts)) {
     } else if (strstart(p, "egl-headless", &opts)) {
-#ifdef CONFIG_OPENGL
+#ifdef CONFIG_OPENGL_DMABUF
         request_opengl = 1;
         request_opengl = 1;
         display_opengl = 1;
         display_opengl = 1;
         display = DT_EGL;
         display = DT_EGL;
@@ -4668,7 +4668,7 @@ int main(int argc, char **argv, char **envp)
         qemu_spice_display_init();
         qemu_spice_display_init();
     }
     }
 
 
-#ifdef CONFIG_OPENGL
+#ifdef CONFIG_OPENGL_DMABUF
     if (display_type == DT_EGL) {
     if (display_type == DT_EGL) {
         egl_headless_init();
         egl_headless_init();
     }
     }