summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2013-12-14 11:27:29 -0800
committerCarl Worth <cworth@cworth.org>2014-03-04 12:58:10 -0800
commitb74da80b71ae9799ba06cfcfdcd3307db3fb2208 (patch)
treefb8bd3fb30f131660e643f5a3f91d4b353b63ede
parent89c6473ff0890b84f1400b9cd6f31146b75a7f4c (diff)
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> (cherry picked from commit abfa65ca811099332c8683dada9a2ee44cc01dc9)
-rw-r--r--src/mesa/drivers/common/meta.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 87913a0db7f..a5822a79a76 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -2972,8 +2972,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);
@@ -3338,8 +3338,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);