On Mon, Nov 9, 2015 at 4:56 PM, Ian Romanick <i...@freedesktop.org> wrote: > From: Ian Romanick <ian.d.roman...@intel.com> > > Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> > --- > src/mesa/drivers/common/meta_tex_subimage.c | 30 > +++++++++++------------------ > 1 file changed, 11 insertions(+), 19 deletions(-) > > diff --git a/src/mesa/drivers/common/meta_tex_subimage.c > b/src/mesa/drivers/common/meta_tex_subimage.c > index 181dde9..b0ac677 100644 > --- a/src/mesa/drivers/common/meta_tex_subimage.c > +++ b/src/mesa/drivers/common/meta_tex_subimage.c > @@ -109,32 +109,24 @@ create_texture_for_pbo(struct gl_context *ctx, > > assert(create_pbo); > > - _mesa_GenBuffers(1, tmp_pbo); > - > - /* We are not doing this inside meta_begin/end. However, we know the > - * client doesn't have the given target bound, so we can go ahead and > - * squash it. We'll set it back when we're done. > - */ > - _mesa_BindBuffer(pbo_target, *tmp_pbo); > + _mesa_CreateBuffers(1, tmp_pbo); > > /* In case of GL_PIXEL_PACK_BUFFER, pass null pointer for the pixel > - * data to avoid unnecessary data copying in _mesa_BufferData(). > + * data to avoid unnecessary data copying in _mesa_NamedBufferData(). > */ > if (is_pixel_pack) > - _mesa_BufferData(pbo_target, > - last_pixel - first_pixel, > - NULL, > - GL_STREAM_READ); > + _mesa_NamedBufferData(*tmp_pbo, > + last_pixel - first_pixel, > + NULL, > + GL_STREAM_READ); > else > - _mesa_BufferData(pbo_target, > - last_pixel - first_pixel, > - (char *)pixels + first_pixel, > - GL_STREAM_DRAW); > + _mesa_NamedBufferData(*tmp_pbo, > + last_pixel - first_pixel, > + (char *)pixels + first_pixel, > + GL_STREAM_DRAW); > > - buffer_obj = packing->BufferObj; > + buffer_obj = _mesa_lookup_bufferobj(ctx, *tmp_pbo); > first_pixel = 0; > - > - _mesa_BindBuffer(pbo_target, 0); > } > > _mesa_GenTextures(1, tmp_tex); > -- > 2.1.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
