Commit dea46359 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150312-2' into staging 



misc ui patches, mostly sdl related.

# gpg: Signature made Thu Mar 12 14:51:07 2015 GMT 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-20150312-2:
  pixman: add a bunch of PIXMAN_BE_* defines for 32bpp
  Allow the use of X11 from a non standard location.
  configure: opengl overhaul
  sdl: Fix crash when calling sdl_switch() with NULL surface
  sdl: Refresh debug statements

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f3dd251d 43db7c3d

configure

+34 −25
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ rbd="" 
smartcard_nss=""

libusb=""

usb_redir=""

glx=""

opengl=""

zlib="yes"

lzo=""

snappy=""
@@ -1027,9 +1027,9 @@ for opt do 
  ;;

  --enable-vhost-scsi) vhost_scsi="yes"

  ;;

  --disable-glx) glx="no"

  --disable-opengl) opengl="no"

  ;;

  --enable-glx) glx="yes"

  --enable-opengl) opengl="yes"

  ;;

  --disable-rbd) rbd="no"

  ;;
@@ -2084,6 +2084,15 @@ if test "$sparse" != "no" ; then 
  fi

fi



##########################################

# X11 probe

x11_cflags=

x11_libs=-lX11

if $pkg_config --exists "x11"; then

    x11_cflags=`$pkg_config --cflags x11`

    x11_libs=`$pkg_config --libs x11`

fi



##########################################

# GTK probe
@@ -2111,7 +2120,8 @@ if test "$gtk" != "no"; then 
        gtk_cflags=`$pkg_config --cflags $gtkpackage`

        gtk_libs=`$pkg_config --libs $gtkpackage`

        if $pkg_config --exists "$gtkx11package >= $gtkversion"; then

            gtk_libs="$gtk_libs -lX11"

            gtk_cflags="$gtk_cflags $x11_cflags"

            gtk_libs="$gtk_libs $x11_libs"

        fi

        libs_softmmu="$gtk_libs $libs_softmmu"

        gtk="yes"
@@ -2236,8 +2246,9 @@ if test "$sdl" = "yes" ; then 
#endif

int main(void) { return 0; }

EOF

  if compile_prog "$sdl_cflags" "$sdl_libs" ; then

    sdl_libs="$sdl_libs -lX11"

  if compile_prog "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" ; then

    sdl_cflags="$sdl_cflags $x11_cflags"

    sdl_libs="$sdl_libs $x11_libs"

  fi

  libs_softmmu="$sdl_libs $libs_softmmu"

fi
@@ -3107,23 +3118,20 @@ fi 
libs_softmmu="$libs_softmmu $fdt_libs"



##########################################

# GLX probe, used by milkymist-tmu2

if test "$glx" != "no" ; then

  glx_libs="-lGL -lX11"

  cat > $TMPC << EOF

#include <X11/Xlib.h>

#include <GL/gl.h>

#include <GL/glx.h>

int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; }

EOF

  if compile_prog "" "-lGL -lX11" ; then

    glx=yes

# opengl probe (for sdl2, milkymist-tmu2)

if test "$opengl" != "no" ; then

  opengl_pkgs="gl glx"

  if $pkg_config $opengl_pkgs x11; then

    opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags"

    opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs"

    opengl=yes

  else

    if test "$glx" = "yes" ; then

      feature_not_found "glx" "Install GL devel (e.g. MESA)"

    if test "$opengl" = "yes" ; then

      feature_not_found "opengl" "Install GL devel (e.g. MESA)"

    fi

    glx_libs=

    glx=no

    opengl_cflags=""

    opengl_libs=""

    opengl=no

  fi

fi
@@ -4390,7 +4398,7 @@ echo "xfsctl support $xfs" 
echo "nss used          $smartcard_nss"

echo "libusb            $libusb"

echo "usb net redir     $usb_redir"

echo "GLX support       $glx"

echo "OpenGL support    $opengl"

echo "libiscsi support  $libiscsi"

echo "libnfs support    $libnfs"

echo "build guest agent $guest_agent"
@@ -4756,9 +4764,10 @@ if test "$usb_redir" = "yes" ; then 
  echo "CONFIG_USB_REDIR=y" >> $config_host_mak

fi



if test "$glx" = "yes" ; then

  echo "CONFIG_GLX=y" >> $config_host_mak

  echo "GLX_LIBS=$glx_libs" >> $config_host_mak

if test "$opengl" = "yes" ; then

  echo "CONFIG_OPENGL=y" >> $config_host_mak

  echo "OPENGL_CFLAGS=$opengl_cflags" >> $config_host_mak

  echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak

fi



if test "$lzo" = "yes" ; then

default-configs/lm32-softmmu.mak

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


CONFIG_LM32=y

CONFIG_MILKYMIST=y

CONFIG_MILKYMIST_TMU2=$(CONFIG_GLX)

CONFIG_MILKYMIST_TMU2=$(CONFIG_OPENGL)

CONFIG_FRAMEBUFFER=y

CONFIG_PTIMER=y

CONFIG_PFLASH_CFI01=y

hw/display/Makefile.objs

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ common-obj-$(CONFIG_ZAURUS) += tc6393xb.o 


ifeq ($(CONFIG_MILKYMIST_TMU2),y)

common-obj-y += milkymist-tmu2.o

libs_softmmu += $(GLX_LIBS)

milkymist-tmu2.o-cflags := $(OPENGL_CFLAGS)

libs_softmmu += $(OPENGL_LIBS)

endif



obj-$(CONFIG_OMAP) += omap_dss.o

hw/lm32/milkymist-hw.h

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, 
    return dev;

}



#ifdef CONFIG_GLX

#ifdef CONFIG_OPENGL

#include <X11/Xlib.h>

#include <GL/glx.h>

static const int glx_fbconfig_attr[] = {
@@ -100,7 +100,7 @@ static const int glx_fbconfig_attr[] = { 
static inline DeviceState *milkymist_tmu2_create(hwaddr base,

        qemu_irq irq)

{

#ifdef CONFIG_GLX

#ifdef CONFIG_OPENGL

    DeviceState *dev;

    Display *d;

    GLXFBConfig *configs;

include/sysemu/sysemu.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ extern int graphic_width; 
extern int graphic_height;

extern int graphic_depth;

extern DisplayType display_type;

extern int display_opengl;

extern const char *keyboard_layout;

extern int win2k_install_hack;

extern int alt_grab;