From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyHCM-0002bL-Qu for qemu-devel@nongnu.org; Fri, 29 May 2015 06:07:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyHCH-0000XT-RG for qemu-devel@nongnu.org; Fri, 29 May 2015 06:07:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyHCH-0000Ww-KN for qemu-devel@nongnu.org; Fri, 29 May 2015 06:07:25 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 47D3D2C76F8 for ; Fri, 29 May 2015 10:07:25 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 29 May 2015 12:07:12 +0200 Message-Id: <1432894036-28513-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1432894036-28513-1-git-send-email-kraxel@redhat.com> References: <1432894036-28513-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/5] ui: use libexpoxy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann libepoxy does the opengl extension handling for us. It also is helpful for trouble-shooting as it prints nice error messages instead of silently failing or segfaulting in case we do something wrong, like using gl commands not supported by the current context. Signed-off-by: Gerd Hoffmann Reviewed-by: Max Reitz --- configure | 4 ++-- include/ui/console.h | 3 +-- include/ui/shader.h | 5 +---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configure b/configure index b707429..ac37296 100755 --- a/configure +++ b/configure @@ -3166,14 +3166,14 @@ else fi if test "$opengl" != "no" ; then - opengl_pkgs="gl glesv2" + opengl_pkgs="gl glesv2 epoxy" if $pkg_config $opengl_pkgs x11 && test "$have_glx" = "yes"; then opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags" opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs" opengl=yes else if test "$opengl" = "yes" ; then - feature_not_found "opengl" "Install GL devel (e.g. MESA)" + feature_not_found "opengl" "Please install opengl (mesa) devel pkgs: $opengl_pkgs" fi opengl_cflags="" opengl_libs="" diff --git a/include/ui/console.h b/include/ui/console.h index e8b3a9e..383dec2 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -10,8 +10,7 @@ #include "qapi/error.h" #ifdef CONFIG_OPENGL -# include -# include +# include #endif /* keyboard/mouse support */ diff --git a/include/ui/shader.h b/include/ui/shader.h index 1ff926c..992cde6 100644 --- a/include/ui/shader.h +++ b/include/ui/shader.h @@ -1,7 +1,4 @@ -#ifdef CONFIG_OPENGL -# include -# include -#endif +#include void qemu_gl_run_texture_blit(GLint texture_blit_prog); -- 1.8.3.1