[Mesa-dev] [PATCH 4/4] mesa: Update _mesa_has_geometry_shaders

[Ian Romanick]

On 01/21/2016 07:17 AM, Marta Lofstedt wrote:
> From: Marta Lofstedt <marta.lofstedt at intel.com>
> 
> Updates the _mesa_has_geometry_shaders function to also look
> for OpenGL ES 3.1 contexts that has OES_geometry_shader enabled.

Blank line here. :)

> Reviewed-by: Matt Turner <mattst88 at gmail.com>

This patch is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>  src/mesa/main/context.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
> index 8b64f45..46444d2 100644
> --- a/src/mesa/main/context.h
> +++ b/src/mesa/main/context.h
> @@ -330,7 +330,8 @@ _mesa_is_gles31(const struct gl_context *ctx)
>  static inline bool
>  _mesa_has_geometry_shaders(const struct gl_context *ctx)
>  {
> -   return _mesa_is_desktop_gl(ctx) && ctx->Version >= 32;
> +   return _mesa_has_OES_geometry_shader(ctx) ||
> +          (_mesa_is_desktop_gl(ctx) && ctx->Version >= 32);
>  }
>  
>  
>