From c8438b62b71f4e2bd3801e936143c439a68c4bd2 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 8 Jul 2016 11:48:15 -0700 Subject: mesa: Add {OES,EXT}_tessellation_shader to the extensions table. Also update _mesa_has_tessellation to know about the new extensions. For now, these are dummy_false, to avoid turning on the extension until everything's in place. Eventually, we'll move them over to the "ARB_tessellation_shader" bit so that any drivers supporting both the desktop extension and ES 3.1 get the feature. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/mesa/main/context.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mesa/main/context.h') diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 133b17f59b2..187138897be 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -354,8 +354,11 @@ _mesa_has_shader_subroutine(const struct gl_context *ctx) static inline GLboolean _mesa_has_tessellation(const struct gl_context *ctx) { - return ctx->API == API_OPENGL_CORE && - ctx->Extensions.ARB_tessellation_shader; + /* _mesa_has_EXT_tessellation_shader(ctx) is redundant with the OES + * check, so don't bother calling it. + */ + return _mesa_has_OES_tessellation_shader(ctx) || + _mesa_has_ARB_tessellation_shader(ctx); } -- cgit v1.2.3