Mesa (master): meta: Consistenly use non-Apple VAO functions
Ian Romanick
idr at kemper.freedesktop.org
Sun Feb 2 15:50:01 UTC 2014
Module: Mesa
Branch: master
Commit: abfa65ca811099332c8683dada9a2ee44cc01dc9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=abfa65ca811099332c8683dada9a2ee44cc01dc9
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Sat Dec 14 11:27:29 2013 -0800
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 at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: "9.1 9.2 10.0" <mesa-stable at lists.freedesktop.org>
---
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 b898a27..3479eb1 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);
More information about the mesa-commit
mailing list