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.c | 12 +++++------- > src/mesa/drivers/common/meta_blit.c | 2 +- > src/mesa/drivers/common/meta_generate_mipmap.c | 4 ++-- > 3 files changed, 8 insertions(+), 10 deletions(-) > > diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c > index e27489d..270933f 100644 > --- a/src/mesa/drivers/common/meta.c > +++ b/src/mesa/drivers/common/meta.c > @@ -1806,8 +1806,7 @@ meta_clear(struct gl_context *ctx, GLbitfield buffers, > bool glsl) > } > > /* upload new vertex data */ > - _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, > - GL_DYNAMIC_DRAW_ARB); > + _mesa_NamedBufferData(clear->VBO, sizeof(verts), verts, GL_DYNAMIC_DRAW); > > /* draw quad(s) */ > if (fb->MaxNumLayers > 0) { > @@ -1893,7 +1892,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint > srcX, GLint srcY, > verts[3].tex[1] = tex->Ttop; > > /* upload new vertex data */ > - _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); > + _mesa_NamedBufferSubData(copypix->VBO, 0, sizeof(verts), verts); > } > > _mesa_set_enable(ctx, tex->Target, GL_TRUE); > @@ -2211,8 +2210,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, > } > > /* upload new vertex data */ > - _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), > - verts, GL_DYNAMIC_DRAW_ARB); > + _mesa_NamedBufferData(drawpix->VBO, sizeof(verts), verts, > GL_DYNAMIC_DRAW); > > /* set given unpack params */ > ctx->Unpack = *unpack; > @@ -2412,7 +2410,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx, > } > > /* upload new vertex data */ > - _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); > + _mesa_NamedBufferSubData(bitmap->VBO, 0, sizeof(verts), verts); > } > > /* choose different foreground/background alpha values */ > @@ -3117,7 +3115,7 @@ decompress_texture_image(struct gl_context *ctx, > _mesa_set_viewport(ctx, 0, 0, 0, width, height); > > /* upload new vertex data */ > - _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); > + _mesa_NamedBufferSubData(decompress->VBO, 0, sizeof(verts), verts); > > /* setup texture state */ > _mesa_BindTexture(target, texObj->Name); > diff --git a/src/mesa/drivers/common/meta_blit.c > b/src/mesa/drivers/common/meta_blit.c > index 5972a5a..1d661b5 100644 > --- a/src/mesa/drivers/common/meta_blit.c > +++ b/src/mesa/drivers/common/meta_blit.c > @@ -757,7 +757,7 @@ blitframebuffer_texture(struct gl_context *ctx, > verts[3].tex[1] = t1; > verts[3].tex[2] = readAtt->Zoffset; > > - _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); > + _mesa_NamedBufferSubData(blit->VBO, 0, sizeof(verts), verts); > } > > /* setup viewport */ > diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c > b/src/mesa/drivers/common/meta_generate_mipmap.c > index 4800278..bee38e4 100644 > --- a/src/mesa/drivers/common/meta_generate_mipmap.c > +++ b/src/mesa/drivers/common/meta_generate_mipmap.c > @@ -328,8 +328,8 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum > target, > verts[3].tex); > > /* upload vertex data */ > - _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), > - verts, GL_DYNAMIC_DRAW_ARB); > + _mesa_NamedBufferData(mipmap->VBO, sizeof(verts), verts, > + GL_DYNAMIC_DRAW); > > _mesa_meta_bind_fbo_image(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, > dstImage, layer); > > -- > 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