diff options
| author | Ian Romanick <[email protected]> | 2015-11-05 14:16:31 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2015-11-24 11:50:30 -0800 |
| commit | c59e4063576141b0dcf55fb0cb8f7c379fd5932a (patch) | |
| tree | 97893dcda02ea19b6ee795b8a571245fa3021a45 /src/mesa | |
| parent | 702f4e3b942acfa5919f11bdf04bacfb07311d05 (diff) | |
meta: Partially convert _mesa_meta_DrawTex to DSA
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
(cherry picked from commit d5225ee5d92f00958c54b425fe829c811149e889)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index e3b9825859f..aa5b6605635 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3303,14 +3303,15 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, _mesa_BindVertexArray(drawtex->VAO); /* create vertex array buffer */ - _mesa_GenBuffers(1, &drawtex->VBO); - _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO); - _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), - NULL, GL_DYNAMIC_DRAW_ARB); + _mesa_CreateBuffers(1, &drawtex->VBO); + _mesa_NamedBufferData(drawtex->VBO, sizeof(verts), + NULL, GL_DYNAMIC_DRAW_ARB); /* client active texture is not part of the array object */ active_texture = ctx->Array.ActiveTexture; + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO); + /* setup vertex arrays */ _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x)); _mesa_EnableClientState(GL_VERTEX_ARRAY); @@ -3325,7 +3326,6 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, } else { _mesa_BindVertexArray(drawtex->VAO); - _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO); } /* vertex positions, texcoords */ @@ -3390,7 +3390,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, verts[3].st[i][1] = t1; } - _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_NamedBufferSubData(drawtex->VBO, 0, sizeof(verts), verts); } _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); |