diff options
| author | Stefan Hajnoczi | 2017-05-15 15:26:02 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2017-05-15 15:26:47 +0200 |
| commit | 384d9d554aa4de0aa81a5b0be074d8c02f0941d4 (patch) | |
| tree | 8b3402c12d71ad53e50638d64b6482752f7597f1 /ui/gtk-egl.c | |
| parent | Merge remote-tracking branch 'ehabkost/tags/x86-and-machine-pull-request' int... (diff) | |
| parent | vnc: replace hweight_long() with ctpopl() (diff) | |
| download | qemu-384d9d554aa4de0aa81a5b0be074d8c02f0941d4.tar.gz qemu-384d9d554aa4de0aa81a5b0be074d8c02f0941d4.tar.xz qemu-384d9d554aa4de0aa81a5b0be074d8c02f0941d4.zip | |
Merge remote-tracking branch 'kraxel/tags/pull-ui-20170512-1' into staging
ui: add egl-headless
ui: some vnc cleanups
ui: absolute events for input-linux
# gpg: Signature made Fri 12 May 2017 12:50:07 PM 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-20170512-1:
vnc: replace hweight_long() with ctpopl()
vnc: simple clean up
opengl: add egl-headless display
egl: explicitly ask for core context
egl-helpers: add missing error check
egl-helpers: fix display init for x11
egl-helpers: drop support for gles and debug logging
virtio-gpu: move virtio_gpu_gl_block
ui: input-linux: Add absolute event support
ui: Support non-zero minimum values for absolute input axes
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'ui/gtk-egl.c')
| -rw-r--r-- | ui/gtk-egl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index d53288f027..cf48cca259 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -246,7 +246,7 @@ void gtk_egl_init(void) GdkDisplay *gdk_display = gdk_display_get_default(); Display *x11_display = gdk_x11_display_get_xdisplay(gdk_display); - if (qemu_egl_init_dpy(x11_display, false, false) < 0) { + if (qemu_egl_init_dpy_x11(x11_display) < 0) { return; } |