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 <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Cc: "9.1 9.2 10.0" <mesa-stable@lists.freedesktop.org>

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index b898a276ec46bc0e66d4d37b83bfdba9bebe70ef..3479eb16d6ff2c6a1c22ef4440fd0fbd1a450fa5 100644 (file)
--- 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);