Commit a4657d4b authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 14c1f7de 371ec54e

ui/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -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

vl.c

+2 −2
Original line number Diff line number Diff line
@@ -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();

    }