From abfa65ca811099332c8683dada9a2ee44cc01dc9 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sat, 14 Dec 2013 11:27:29 -0800 Subject: [PATCH] meta: Consistenly use non-Apple VAO functions For these objects, meta was already using the non-Apple function to delete the objects. Everywhere else in the file uses _mesa_GenVertexArrays and _mesa_BindVertexArrays. Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Cc: "9.1 9.2 10.0" --- src/mesa/drivers/common/meta.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index b898a276ec4..3479eb16d6f 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3026,8 +3026,8 @@ _mesa_meta_Bitmap(struct gl_context *ctx, /* one-time setup */ /* create vertex array object */ - _mesa_GenVertexArraysAPPLE(1, &bitmap->ArrayObj); - _mesa_BindVertexArrayAPPLE(bitmap->ArrayObj); + _mesa_GenVertexArrays(1, &bitmap->ArrayObj); + _mesa_BindVertexArray(bitmap->ArrayObj); /* create vertex array buffer */ _mesa_GenBuffers(1, &bitmap->VBO); @@ -3392,8 +3392,8 @@ setup_ff_generate_mipmap(struct gl_context *ctx, if (mipmap->ArrayObj == 0) { /* one-time setup */ /* create vertex array object */ - _mesa_GenVertexArraysAPPLE(1, &mipmap->ArrayObj); - _mesa_BindVertexArrayAPPLE(mipmap->ArrayObj); + _mesa_GenVertexArrays(1, &mipmap->ArrayObj); + _mesa_BindVertexArray(mipmap->ArrayObj); /* create vertex array buffer */ _mesa_GenBuffers(1, &mipmap->VBO); -- 2.30.2