mesa/main: fix up _mesa_has_rg_textures for gles2
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Tue, 4 Dec 2018 11:34:39 +0000 (12:34 +0100)
committerErik Faye-Lund <erik.faye-lund@collabora.com>
Tue, 4 Dec 2018 20:14:26 +0000 (21:14 +0100)
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@collabora.com>
Tested-by: Mark Janes <mark.a.janes@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/mesa/main/context.h

index cdda8cf201273c5de627e05516c4d209ef48b2b3..7de10e9924b8fe41a0243d892af853e442b2e6f0 100644 (file)
@@ -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