From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtYPR-00009x-4i for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtYPM-0003xN-Sx for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtYPM-0003xI-NA for qemu-devel@nongnu.org; Tue, 03 Nov 2015 05:01:40 -0500 From: Gerd Hoffmann Date: Tue, 3 Nov 2015 11:01:29 +0100 Message-Id: <1446544891-3600-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1446544891-3600-1-git-send-email-kraxel@redhat.com> References: <1446544891-3600-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 4/6] ui/opengl: Reduce build required libraries for opengl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Walle , Gerd Hoffmann , OGAWA Hirofumi From: OGAWA Hirofumi We now use epoxy to load opengl libraries. This means we don't need to link opengl libraries directly if interfaces handled by epoxy. With this, we just need epoxy headers and epoxy's *.so to build. Tested with epoxy-1.3.1. - sdl2/gtk/console egl stuff doesn't require other than epoxy - milkymist-tmu2 glx stuff doesn't require other than epoxy (lm32 test is limited, because can't find mmone-bios.bin, so just test to load libGL with "./lm32-softmmu/qemu-system-lm32 -M milkymist,accel=qtest") Signed-off-by: OGAWA Hirofumi [ lm32 tested by kraxel ] Signed-off-by: Gerd Hoffmann --- configure | 20 +++----------------- hw/display/milkymist-tmu2.c | 4 ++-- hw/lm32/milkymist-hw.h | 3 ++- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 7a1d08d..b4a3488 100755 --- a/configure +++ b/configure @@ -3286,25 +3286,11 @@ fi libs_softmmu="$libs_softmmu $fdt_libs" ########################################## -# opengl probe (for sdl2, milkymist-tmu2) - -# GLX probe, used by milkymist-tmu2 -# this is temporary, code will be switched to egl mid-term. -cat > $TMPC << EOF -#include -#include -#include -int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; } -EOF -if compile_prog "" "-lGL -lX11" ; then - have_glx=yes -else - have_glx=no -fi +# opengl probe (for sdl2, gtk, milkymist-tmu2) if test "$opengl" != "no" ; then - opengl_pkgs="gl glesv2 epoxy egl" - if $pkg_config $opengl_pkgs x11 && test "$have_glx" = "yes"; then + opengl_pkgs="epoxy" + 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 diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c index 3e1d0b9..e2de281 100644 --- a/hw/display/milkymist-tmu2.c +++ b/hw/display/milkymist-tmu2.c @@ -30,8 +30,8 @@ #include "qemu/error-report.h" #include -#include -#include +#include +#include enum { R_CTL = 0, diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h index 8d20cac..c8dfb4d 100644 --- a/hw/lm32/milkymist-hw.h +++ b/hw/lm32/milkymist-hw.h @@ -88,7 +88,8 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, #ifdef CONFIG_OPENGL #include -#include +#include +#include static const int glx_fbconfig_attr[] = { GLX_GREEN_SIZE, 5, GLX_GREEN_SIZE, 6, -- 1.8.3.1