Thanks, pushed.
On Mon, Feb 1, 2016 at 5:37 PM, Mauro Rossi <issor.or...@gmail.com> wrote: > The change is necessary to avoid the following building error in android: > > external/mesa/src/gallium/drivers/nouveau/nouveau_vp3_video_bsp.c: In > function 'nouveau_vp3_bsp_next': > external/mesa/src/gallium/drivers/nouveau/nouveau_vp3_video_bsp.c:269:14: > error: 'bsp_bo' undeclared (first use in this function) > assert(bsp_bo->size >= str_bsp->w0[0] + num_bytes[i]); > ^ > > build/core/binary.mk:801: recipe for target > 'out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_pipe_nouveau_intermediates/nouveau_vp3_video_bsp.o' > failed > make: *** > [out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_pipe_nouveau_intermediates/nouveau_vp3_video_bsp.o] > Error 1 > make: *** Waiting for unfinished jobs.... > --- > src/gallium/drivers/nouveau/nouveau_vp3_video_bsp.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video_bsp.c > b/src/gallium/drivers/nouveau/nouveau_vp3_video_bsp.c > index a3d07de..c6c287b 100644 > --- a/src/gallium/drivers/nouveau/nouveau_vp3_video_bsp.c > +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video_bsp.c > @@ -266,7 +266,9 @@ nouveau_vp3_bsp_next(struct nouveau_vp3_decoder *dec, > unsigned num_buffers, > int i; > > for (i = 0; i < num_buffers; ++i) { > +#ifndef NDEBUG > assert(bsp_bo->size >= str_bsp->w0[0] + num_bytes[i]); > +#endif > memcpy(dec->bsp_ptr, data[i], num_bytes[i]); > dec->bsp_ptr += num_bytes[i]; > str_bsp->w0[0] += num_bytes[i]; > -- > 2.5.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev