On Mon, 17 Oct 2011 00:37:16 +0200, vlj <v...@ovi.com> wrote: > --- > src/glsl/glsl_lexer.ll | 3 ++- > src/glsl/glsl_parser_extras.cpp | 1 + > src/glsl/glsl_parser_extras.h | 2 ++ > 3 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll > index cfd8926..a091f62 100644 > --- a/src/glsl/glsl_lexer.ll > +++ b/src/glsl/glsl_lexer.ll > @@ -260,7 +260,8 @@ layout { > if ((yyextra->language_version >= 140) > || yyextra->AMD_conservative_depth_enable > || yyextra->ARB_explicit_attrib_location_enable > - || yyextra->ARB_fragment_coord_conventions_enable) { > + || yyextra->ARB_fragment_coord_conventions_enable > + || yyextra->ARB_uniform_buffer_object_enable) { > return LAYOUT_TOK; > } else { > yylval->identifier = strdup(yytext); > diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp > index 8f740e6..61e3933 100644 > --- a/src/glsl/glsl_parser_extras.cpp > +++ b/src/glsl/glsl_parser_extras.cpp > @@ -265,6 +265,7 @@ static const _mesa_glsl_extension > _mesa_glsl_supported_extensions[] = { > EXT(AMD_conservative_depth, true, false, true, true, false, > AMD_conservative_depth), > EXT(AMD_shader_stencil_export, false, false, true, true, false, > ARB_shader_stencil_export), > EXT(OES_texture_3D, true, false, true, false, true, > EXT_texture3D), > + EXT(ARB_uniform_buffer_object, true, false, true, true, false, > dummy_true), > };
UBOs should require driver support, so you can't just always say it's enabled. And certainly not as the second patch of a series to add support for the extension.
pgpYu2ufjI59s.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev