On Wed, Nov 25, 2015 at 1:31 PM, Emil Velikov <[email protected]> wrote: > From: Emil Velikov <[email protected]> > > The header is already included by glsl_types.{cpp,h}. > > Signed-off-by: Emil Velikov <[email protected]> > --- > src/glsl/nir/builtin_type_macros.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/src/glsl/nir/builtin_type_macros.h > b/src/glsl/nir/builtin_type_macros.h > index 8e16ae4..7bd2e4e 100644 > --- a/src/glsl/nir/builtin_type_macros.h > +++ b/src/glsl/nir/builtin_type_macros.h > @@ -28,8 +28,6 @@ > * language version or extension might provide them. > */ > > -#include "glsl_types.h" > - > DECL_TYPE(error, GL_INVALID_ENUM, GLSL_TYPE_ERROR, 0, 0) > DECL_TYPE(void, GL_INVALID_ENUM, GLSL_TYPE_VOID, 0, 0) > > -- > 2.6.2
This looked funny at first, but I believe it's the right thing to do -- builtin_type_macros.h exists so that its contents can be included potentially multiple times (see glsl_types.h). Reviewed-by: Matt Turner <[email protected]> _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
