From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 19 Oct 2017 11:09:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/opengl-20171017-pull-request' into... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba6f0fc25e3c14fbb36f4b5a616a89cd3f1de6d0;p=qmiga%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/opengl-20171017-pull-request' into staging

ui: opengl updates for dma-buf support.

# gpg: Signature made Tue 17 Oct 2017 12:13:36 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

* remotes/kraxel/tags/opengl-20171017-pull-request:
  egl-headless: add dmabuf support
  egl-helpers: add egl_texture_blit and egl_texture_blend
  egl-helpers: add dmabuf import support
  opengl: add flipping vertex shader
  opengl: move shader init from console-gl.c to shader.c
  console: add support for dmabufs

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

ba6f0fc25e3c14fbb36f4b5a616a89cd3f1de6d0