summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2013-12-14 11:27:29 -0800
committerIan Romanick <[email protected]>2014-02-02 16:49:09 +0100
commitabfa65ca811099332c8683dada9a2ee44cc01dc9 (patch)
treebd161a341a727c3633ff653f7a2634fc3f7bd808
parent070f55d8935af6fee62506b54bc86c1bf5049a82 (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 <[email protected]> Reviewed-by: Brian Paul <[email protected]> Cc: "9.1 9.2 10.0" <[email protected]>
-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 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);