[PATCH] glamor: Disable definitions of GL extension prototypes to avoid warnings.

Zhigang Gong zhigang.gong at linux.intel.com
Sun Jan 26 17:32:05 PST 2014


LGTM,thanks.

Reviewed-by: Zhigang Gong <zhigang.gong at linux.intel.com>

> -----Original Message-----
> From: xorg-devel-bounces at lists.x.org
[mailto:xorg-devel-bounces at lists.x.org]
> On Behalf Of Eric Anholt
> Sent: Saturday, January 25, 2014 3:01 AM
> To: xorg-devel at lists.freedesktop.org
> Subject: [PATCH] glamor: Disable definitions of GL extension prototypes to
> avoid warnings.
> 
> We're not using the extension prototypes, since you have to dlsym them
> anyway.  Disabling their definitions prevents them from being defined
twice
> (once by gl.h, once by glext.h).
> 
> Signed-off-by: Eric Anholt <eric at anholt.net>
> ---
> 
> I was about to send the pull req for the glamor reformat and initial build
work,
> but realized I was running with some default warnings disabled.  This
fixes
> those.
> 
> (It also would have gone away with the epoxy changes that come later).
> 
>  glamor/glamor_priv.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index
> 9f0c558..8ccf4fa 100644
> --- a/glamor/glamor_priv.h
> +++ b/glamor/glamor_priv.h
> @@ -35,8 +35,6 @@
>  #endif
>  #include "glamor.h"
> 
> -#define GL_GLEXT_PROTOTYPES
> -
>  #ifdef GLAMOR_GLES2
>  #include <GLES2/gl2.h>
>  #include <GLES2/gl2ext.h>
> --
> 1.8.5.3
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel



More information about the xorg-devel mailing list