From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuiWV-0007wV-Do for qemu-devel@nongnu.org; Tue, 19 May 2015 10:29:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuiWP-0005TD-1x for qemu-devel@nongnu.org; Tue, 19 May 2015 10:29:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuiWO-0005Sx-U5 for qemu-devel@nongnu.org; Tue, 19 May 2015 10:29:29 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 9A0582B51DA for ; Tue, 19 May 2015 14:29:28 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 19 May 2015 16:29:18 +0200 Message-Id: <1432045761-15543-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1432045761-15543-1-git-send-email-kraxel@redhat.com> References: <1432045761-15543-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] 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 --- configure | 2 +- include/ui/console.h | 3 +-- include/ui/shader.h | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 1f0f485..df1048a 100755 --- a/configure +++ b/configure @@ -3153,7 +3153,7 @@ 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" 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