ui: egl-headless requires dmabuf support

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJZHrDwAAoJEEy22O7T6HE4n14QALHW1WQeduvdNOmepWsHnYL3
 lFmfSWwsBhzOWs2EPdoy/LhP1gpuiBHu6DIfFP0SAtTrt7+bfZKEXSH2+AFmZPmk
 VANRcGIswPl0cbp6Zui/xAhJHYm5RsfFvEovjnXsbm0NuPIEbeAswTEs7ctxIBkI
 6XH5nUYCFlcUe+PHwqhXkup0Hls5b92ScjKVE9u9Ht6WfQE4JjOrD1jwTAiUADSa
 VZ4O7+ppxxCHFvqBqnVSBEJeNBL1vYs5NPm6hbwaXQJnMxqaC2iFjuyvqRHBp10n
 61OxagIpd989GnkyYZKOoODFemLk1ljWECeXqKAygCct7XFROc1VWGXkx5qweFKI
 1dtuNuJbBoB6CG+8Yh00ZzVRskX6iGS/E6VsN5s0IxRpBQiVCXMy10P1iIi1/wbX
 ZL1WuInbbpKoHNTaEnE1YtukzGfJQU3qzu760ENcg4xOM5jJ/bd7l5SUNRwDLirR
 QLb29Zy7uUDjG4V7PgLXVAKjiUly80OVdRiLpmS2QpsDu2PYrkMkzedve729krQR
 6lWok64et/jEzXk864xqETAxtxqmDXzlwQp1My8P1B3ejL01RNRSmyR+uSroqBQX
 IJ9ecmUSK88NNvFFk6k53ER5PLb7rhlBdvImiqZ7eYaFCEth18pu1E7P2V+vUQQW
 Ef39dN9xmosU7k2YhSdR
 =pYfJ
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Stefan Hajnoczi 2017-05-19 16:44:18 +01:00
commit a4657d4b91
2 changed files with 3 additions and 3 deletions

View File

@ -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

4
vl.c
View File

@ -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();
}