[Mesa-dev] [PATCH] glcpp: Only expose ARB_enhanced_layouts if it's supported.

[Dylan Baker]

Quoting Ian Romanick (2016-06-16 20:07:14)
> This patch is
> 
> Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
> 
> On 06/16/2016 06:15 PM, Dylan Baker wrote:
> > This fixes the following piglit tests:
> > spec/arb_enhanced_layouts/preprocessor/disabled-defined-core.*
> > 
> > Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> > ---
> >  src/compiler/glsl/glcpp/glcpp-parse.y | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y
> > index 2cfa6a6..76cba07 100644
> > --- a/src/compiler/glsl/glcpp/glcpp-parse.y
> > +++ b/src/compiler/glsl/glcpp/glcpp-parse.y
> > @@ -2338,12 +2338,14 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
> >        }
> >     } else {
> >        add_builtin_define(parser, "GL_ARB_draw_buffers", 1);
> > -      add_builtin_define(parser, "GL_ARB_enhanced_layouts", 1);
> >        add_builtin_define(parser, "GL_ARB_separate_shader_objects", 1);
> >        add_builtin_define(parser, "GL_ARB_texture_rectangle", 1);
> >        add_builtin_define(parser, "GL_AMD_shader_trinary_minmax", 1);
> >  
> >        if (extensions != NULL) {
> > +         if (extensions->ARB_enhanced_layouts)
> > +             add_builtin_define(parser, "GL_ARB_enhanced_layouts", 1);
> > +
> >           if (extensions->EXT_texture_array)
> >              add_builtin_define(parser, "GL_EXT_texture_array", 1);
> >  
> 

I don't have commit access, would you mind pushing this for me too?

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160617/48ba57bb/attachment-0001.sig>