Looks good to me. Sorry about breaking it. Reviewed-by: Neil Roberts <n...@linux.intel.com>
- Neil Rob Herring <r...@kernel.org> writes: > Commit 5fd848f6c9ee ("program: Use _mesa_geometric_samples to calculate > gl_NumSamples") broken Android builds. Add the missing include path "main" > to framebuffer.h like other includes in prog_statevars.c. > > Cc: Neil Roberts <n...@linux.intel.com> > Cc: Ilia Mirkin <imir...@alum.mit.edu> > Signed-off-by: Rob Herring <r...@kernel.org> > --- > v2: Add main to #include instead of adding the path to Android.mk > > src/mesa/program/prog_statevars.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/mesa/program/prog_statevars.c > b/src/mesa/program/prog_statevars.c > index eed2412..af5fefe 100644 > --- a/src/mesa/program/prog_statevars.c > +++ b/src/mesa/program/prog_statevars.c > @@ -40,7 +40,7 @@ > #include "prog_statevars.h" > #include "prog_parameter.h" > #include "main/samplerobj.h" > -#include "framebuffer.h" > +#include "main/framebuffer.h" > > > #define ONE_DIV_SQRT_LN2 (1.201122408786449815) > -- > 2.5.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev