diff options
| author | Ian Romanick <[email protected]> | 2015-11-02 18:36:34 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2015-11-24 11:36:05 -0800 |
| commit | e097324fee3d3cf12a752d6c27c8a093ef0f3a88 (patch) | |
| tree | 8213fe345d1d56f5b70cb37d871cd85e0f7fd50a | |
| parent | aa607c69af724a75763a14258a6ce2ec5c770171 (diff) | |
meta: Use _mesa_NamedBufferData and _mesa_NamedBufferSubData for users of _mesa_meta_setup_vertex_objects
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
(cherry picked from commit 7f2f3000716d994d94c53f4a0c8a211fb00a46a4)
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/common/meta_blit.c | 2 | ||||
| -rw-r--r-- | 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 0ffcd9c2c3f..7848e5d7b67 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -1817,8 +1817,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) { @@ -1904,7 +1903,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); @@ -2222,8 +2221,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; @@ -2423,7 +2421,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 */ @@ -3128,7 +3126,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 4a2444af0f9..da9f603440e 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -789,7 +789,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 bde170fcf6f..8389217731c 100644 --- a/src/mesa/drivers/common/meta_generate_mipmap.c +++ b/src/mesa/drivers/common/meta_generate_mipmap.c @@ -335,8 +335,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); |