From 522b5d45668bf13493901d5e4ed1ec9e75ae1324 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 21 May 2016 11:46:22 -0700 Subject: [PATCH] glsl: Implicitly enable OES_shader_io_blocks if geom/tess are enabled. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/compiler/glsl/glsl_parser_extras.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index 991cfc6..0294ef7 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -267,8 +267,19 @@ struct _mesa_glsl_parse_state { bool has_shader_io_blocks() const { + /* The OES_geometry_shader_specification says: + * + * "If the OES_geometry_shader extension is enabled, the + * OES_shader_io_blocks extension is also implicitly enabled." + * + * The OES_tessellation_shader extension has similar wording. + */ return OES_shader_io_blocks_enable || EXT_shader_io_blocks_enable || + OES_geometry_shader_enable || + OES_tessellation_shader_enable || + EXT_tessellation_shader_enable || + is_version(150, 320); } -- 2.7.4