[Mesa-dev] [PATCH] mesa/main: fix up _mesa_has_rg_textures for gles2

[Mark Janes]

Tested-by: Mark Janes <mark.a.janes at intel.com>

Erik Faye-Lund <erik.faye-lund at collabora.com> writes:

> rg-textures are supported in GLES 2.0 if EXT_texture_rg, so let's make
> sure the enums are accepted.
>
> Fixes: 510b6424607 "mesa/main: do not allow rg-textures enums before gles3"
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108936
> Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
> ---
> Whoops, seems I missed an extension to enable RG-textures. Sorry for the
> breakage!

You are welcome to test on the i965 CI, which will quickly catch these
errors for you.

>  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 cdda8cf2012..7de10e9924b 100644
> --- a/src/mesa/main/context.h
> +++ b/src/mesa/main/context.h
> @@ -378,7 +378,8 @@ _mesa_has_packed_float(const struct gl_context *ctx)
>  static inline bool
>  _mesa_has_rg_textures(const struct gl_context *ctx)
>  {
> -   return _mesa_has_ARB_texture_rg(ctx) || _mesa_is_gles3(ctx);
> +   return _mesa_has_ARB_texture_rg(ctx) || _mesa_has_EXT_texture_rg(ctx) ||
> +          _mesa_is_gles3(ctx);
>  }
>  
>  static inline bool
> -- 
> 2.19.2