On 28 March 2015 at 20:54, Emil Velikov <emil.l.veli...@gmail.com> wrote: > From: Mauro Rossi <issor.or...@gmail.com> > > Required by the i965 driver. > > Cc: "10.5" <mesa-sta...@lists.freedesktop.org> > [Emil Velikov: Split from a larger commit] > Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> > --- > src/glsl/Android.gen.mk | 62 > +++++++++++++++++++++++++++++++++++++++-- > src/glsl/Android.mk | 3 +- > src/mesa/drivers/dri/Android.mk | 1 + > 3 files changed, 63 insertions(+), 3 deletions(-) > > diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk > index 7ec56d4..82f2bf1 100644 > --- a/src/glsl/Android.gen.mk > +++ b/src/glsl/Android.gen.mk > @@ -33,11 +33,21 @@ sources := \ > glsl_lexer.cpp \ > glsl_parser.cpp \ > glcpp/glcpp-lex.c \ > - glcpp/glcpp-parse.c > + glcpp/glcpp-parse.c \ > + nir/nir_builder_opcodes.h \
Seems like the nir_builder_opcodes.h addition came after the 10.5 branchpoint. So in order to get this for 10.5 we'll need to split them out into a separate patch. -Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
