From 7c02267673e553d75a1d13c69471b0b794239b9e Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 26 Jun 2017 12:42:25 +0200 Subject: [PATCH] mesa: add KHR_no_error support for gl*Buffers() Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 +- src/mapi/glapi/gen/gl_API.xml | 2 +- src/mesa/main/bufferobj.c | 16 ++++++++++++++++ src/mesa/main/bufferobj.h | 6 ++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml index 860bbbd28ab..87581d48b27 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -49,7 +49,7 @@ - + diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 4d6a08e1247..84195cae7ce 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -5068,7 +5068,7 @@ - + diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 410aa7e4b5a..419972e3712 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -1478,6 +1478,14 @@ create_buffers_err(struct gl_context *ctx, GLsizei n, GLuint *buffers, bool dsa) * \param n Number of IDs to generate. * \param buffers Array of \c n locations to store the IDs. */ +void GLAPIENTRY +_mesa_GenBuffers_no_error(GLsizei n, GLuint *buffers) +{ + GET_CURRENT_CONTEXT(ctx); + create_buffers(ctx, n, buffers, false); +} + + void GLAPIENTRY _mesa_GenBuffers(GLsizei n, GLuint *buffers) { @@ -1491,6 +1499,14 @@ _mesa_GenBuffers(GLsizei n, GLuint *buffers) * \param n Number of IDs to generate. * \param buffers Array of \c n locations to store the IDs. */ +void GLAPIENTRY +_mesa_CreateBuffers_no_error(GLsizei n, GLuint *buffers) +{ + GET_CURRENT_CONTEXT(ctx); + create_buffers(ctx, n, buffers, true); +} + + void GLAPIENTRY _mesa_CreateBuffers(GLsizei n, GLuint *buffers) { diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h index 44342840a81..662ceba8a6c 100644 --- a/src/mesa/main/bufferobj.h +++ b/src/mesa/main/bufferobj.h @@ -164,9 +164,15 @@ _mesa_BindBuffer(GLenum target, GLuint buffer); void GLAPIENTRY _mesa_DeleteBuffers(GLsizei n, const GLuint * buffer); +void GLAPIENTRY +_mesa_GenBuffers_no_error(GLsizei n, GLuint *buffers); + void GLAPIENTRY _mesa_GenBuffers(GLsizei n, GLuint *buffers); +void GLAPIENTRY +_mesa_CreateBuffers_no_error(GLsizei n, GLuint *buffers); + void GLAPIENTRY _mesa_CreateBuffers(GLsizei n, GLuint *buffers); -- 2.30.2