summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2016-05-21 11:46:22 -0700
committerKenneth Graunke <kenneth@whitecape.org>2016-08-08 09:59:03 -0700
commit522b5d45668bf13493901d5e4ed1ec9e75ae1324 (patch)
tree6872418da3640ea8984d70cefabeb9ed8223b5de
parent0eaa84e8af850b627345e473bb5a7cc9941cf2b8 (diff)
downloadexternal_mesa3d-522b5d45668bf13493901d5e4ed1ec9e75ae1324.zip
external_mesa3d-522b5d45668bf13493901d5e4ed1ec9e75ae1324.tar.gz
external_mesa3d-522b5d45668bf13493901d5e4ed1ec9e75ae1324.tar.bz2
glsl: Implicitly enable OES_shader_io_blocks if geom/tess are enabled.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--src/compiler/glsl/glsl_parser_extras.h11
1 files changed, 11 insertions, 0 deletions
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);
}