From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 5 May 2015 13:06:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150505-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=874e9aeeeb74c5459639a93439a502d262847e68;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150505-1' into staging

sdl2: add opengl support

# gpg: Signature made Tue May  5 10:36:25 2015 BST using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-sdl-20150505-1:
  sdl2: Fix RGB555
  sdl2: add support for display rendering using opengl.
  sdl2: move SDL_* includes to sdl2.h
  console-gl: add opengl rendering helper functions
  opengl: add shader helper functions.
  opengl: add shader build infrastructure

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

874e9aeeeb74c5459639a93439a502d262847e68