summaryrefslogtreecommitdiffstats
path: root/src/glsl/glsl_parser_extras.h
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2013-09-23 18:18:14 -0700
committerKenneth Graunke <kenneth@whitecape.org>2013-09-26 16:55:18 -0700
commitf91475d4ab7e1328904a1df443fbf85ed8acb7f3 (patch)
tree0915c00a53c92fd9f65266028a1d8ee4d4978859 /src/glsl/glsl_parser_extras.h
parente4af55c78f9d639653bb9290e0fc63c6658cdc4d (diff)
downloadexternal_mesa3d-f91475d4ab7e1328904a1df443fbf85ed8acb7f3.zip
external_mesa3d-f91475d4ab7e1328904a1df443fbf85ed8acb7f3.tar.gz
external_mesa3d-f91475d4ab7e1328904a1df443fbf85ed8acb7f3.tar.bz2
glsl: Create and use a has_uniform_buffer_objects() helper.
This is better than overriding the extension enable based on the language version; it's robust against shaders that do: #version 140 #extension GL_ARB_uniform_buffer_object : disable Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/glsl_parser_extras.h')
-rw-r--r--src/glsl/glsl_parser_extras.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index 27ebbcf..cef4436 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -126,6 +126,11 @@ struct _mesa_glsl_parse_state {
return ARB_explicit_attrib_location_enable || is_version(330, 300);
}
+ bool has_uniform_buffer_objects() const
+ {
+ return ARB_uniform_buffer_object_enable || is_version(140, 300);
+ }
+
void process_version_directive(YYLTYPE *locp, int version,
const char *ident);