summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-07-18 15:21:22 +0200
committerSamuel Pitoiset <[email protected]>2017-07-31 13:53:39 +0200
commit6f4741e32ed66a2f0df4a03e9a874f08ab666412 (patch)
tree445c5f9fc7e25749b0578a9db8db0cc9d6d1f11b /src/mesa
parentab0f246672edfb5d41203abf7be9a01c9f16b4b4 (diff)
mesa: add KHR_no_error support to gl{Create,Gen}VertexArrays()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/arrayobj.c16
-rw-r--r--src/mesa/main/arrayobj.h6
2 files changed, 22 insertions, 0 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 5b73652bd95..af6a17daeca 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -551,6 +551,14 @@ gen_vertex_arrays_err(struct gl_context *ctx, GLsizei n, GLuint *arrays,
* All arrays will be required to live in VBOs.
*/
void GLAPIENTRY
+_mesa_GenVertexArrays_no_error(GLsizei n, GLuint *arrays)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ gen_vertex_arrays(ctx, n, arrays, false, "glGenVertexArrays");
+}
+
+
+void GLAPIENTRY
_mesa_GenVertexArrays(GLsizei n, GLuint *arrays)
{
GET_CURRENT_CONTEXT(ctx);
@@ -563,6 +571,14 @@ _mesa_GenVertexArrays(GLsizei n, GLuint *arrays)
* Generates ID's and creates the array objects.
*/
void GLAPIENTRY
+_mesa_CreateVertexArrays_no_error(GLsizei n, GLuint *arrays)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ gen_vertex_arrays(ctx, n, arrays, true, "glCreateVertexArrays");
+}
+
+
+void GLAPIENTRY
_mesa_CreateVertexArrays(GLsizei n, GLuint *arrays)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 17949685775..69ffc9250d9 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -98,8 +98,14 @@ void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids);
+void GLAPIENTRY
+_mesa_GenVertexArrays_no_error(GLsizei n, GLuint *arrays);
+
void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
+void GLAPIENTRY
+_mesa_CreateVertexArrays_no_error(GLsizei n, GLuint *arrays);
+
void GLAPIENTRY _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays);
GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );