On 27 November 2015 at 14:31, Marta Lofstedt <marta.lofst...@linux.intel.com> wrote: > From: Marta Lofstedt <marta.lofst...@intel.com> > > Updates the _mesa_has_geometry_shaders function to also look > for OpenGL ES 3.1 contexts that has OES_geometry_shader enabled. > --- > 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..23b2718 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_is_gles31(ctx) && ctx->Extensions.OES_geometry_shader) ||
Please use the new _mesa_has_##name_str helpers from Nanley. They already have the appropriate API and version check - _mesa_has_OES_geometry_shader is what we want here. -Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev