Re: [Qemu-devel] [PATCH 1/4] ui: use libexpoxy

[Max Reitz]

On 19.05.2015 16:29, Gerd Hoffmann wrote:
> 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 <address@hidden>
> ---
>   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"

If the package isn't found, the remedy message ("Install GL devel (e.g. 
MESA)") isn't too helpful now .

Whether you change that or not:

Reviewed-by: Max Reitz <address@hidden>

> 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 <GLES2/gl2.h>
> -# include <GLES2/gl2ext.h>
> +# include <epoxy/gl.h>
>   #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 <GLES2/gl2.h>
> -# include <GLES2/gl2ext.h>
> -#endif
> +#include <epoxy/gl.h>
>   
>   void qemu_gl_run_texture_blit(GLint texture_blit_prog);