From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54822)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Yv1Ww-0006uP-6P
	for qemu-devel@nongnu.org; Wed, 20 May 2015 06:47:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Yv1Ws-0000ba-1Q
	for qemu-devel@nongnu.org; Wed, 20 May 2015 06:47:18 -0400
Received: from mx1.redhat.com ([209.132.183.28]:58757)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mreitz@redhat.com>) id 1Yv1Wr-0000Zf-Q4
	for qemu-devel@nongnu.org; Wed, 20 May 2015 06:47:13 -0400
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4KAlCjc031643
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=FAIL)
	for <qemu-devel@nongnu.org>; Wed, 20 May 2015 06:47:12 -0400
Message-ID: <555C662D.3080908@redhat.com>
Date: Wed, 20 May 2015 12:47:09 +0200
From: Max Reitz <mreitz@redhat.com>
MIME-Version: 1.0
References: <1432045761-15543-1-git-send-email-kraxel@redhat.com>
	<1432045761-15543-2-git-send-email-kraxel@redhat.com>
In-Reply-To: <1432045761-15543-2-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=iso-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/4] ui: use libexpoxy
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org

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 <kraxel@redhat.com>
> ---
>   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 <mreitz@redhat.com>

> 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);