From dcf30025c3e3d43140a687240433de1920adf8b0 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 11 May 2015 12:24:43 +0200 Subject: ui: use libexpoxy 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 b707429625..ac3729673f 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 e8b3a9ea8d..383dec24ff 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 1ff926c9e1..992cde6a80 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); -- cgit v1.2.3