[Mesa-dev] [PATCH 17/23] meta: Partially convert _mesa_meta_DrawTex to DSA

[Anuj Phogat]

On Mon, Nov 9, 2015 at 4:56 PM, Ian Romanick <idr at freedesktop.org> wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/mesa/drivers/common/meta.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
> index 8249eda..1bf3d52 100644
> --- a/src/mesa/drivers/common/meta.c
> +++ b/src/mesa/drivers/common/meta.c
> @@ -3305,14 +3305,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);
> @@ -3327,7 +3328,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 */
> @@ -3392,7 +3392,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);
> --
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>