On 02/18/2014 10:19 AM, Ian Romanick wrote: > From: Ian Romanick <ian.d.roman...@intel.com> > > From page 14 (page 20 of the PDF) of the GLSL 1.10 spec: > > "In addition, all identifiers containing two consecutive underscores > (__) are reserved as possible future keywords." > > The intention is that names containing __ are reserved for internal use > by the implementation, and names prefixed with GL_ are reserved for use > by Khronos. Names simply containing __ are dangerous to use, but should > be allowed. > > Per the Khronos bug mentioned below, a future version of the GLSL > specification will clarify this. > > Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> > Cc: "9.2 10.0 10.1" <mesa-sta...@lists.freedesktop.org> > Cc: Tapani Pälli <lem...@gmail.com> > Cc: Kenneth Graunke <kenn...@whitecape.org> > Cc: Darius Spitznagel <d.spitzna...@goodbytez.de> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71870 > Bugzilla: Khronos #11702 > --- > src/glsl/ast_to_hir.cpp | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp > index 6de73f4..6549ca7 100644 > --- a/src/glsl/ast_to_hir.cpp > +++ b/src/glsl/ast_to_hir.cpp > @@ -2928,10 +2928,17 @@ validate_identifier(const char *identifier, YYLTYPE > loc, > * "In addition, all identifiers containing two > * consecutive underscores (__) are reserved as > * possible future keywords." > + * > + * The intention is that names containing __ are reserved for internal > + * use by the implementation, and names prefixed with GL_ are reserved > + * for use by Khronos. Names simply containing __ are dangerous to > use, > + * but should be allowed. > + * > + * A future version of the GLSL specification will clarify this. > */ > - _mesa_glsl_error(&loc, state, > - "identifier `%s' uses reserved `__' string", > - identifier); > + _mesa_glsl_warning(&loc, state, > + "identifier `%s' uses reserved `__' string", > + identifier); > } > } > >
All three patches are: Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
