diff options
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/bufferobj.c | 16 | ||||
| -rw-r--r-- | 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 @@ <!-- Buffer object functions --> - <function name="CreateBuffers"> + <function name="CreateBuffers" no_error="true"> <param name="n" type="GLsizei" /> <param name="buffers" type="GLuint *" /> </function> 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 @@ <glx ignore="true"/> </function> - <function name="GenBuffers" es1="1.1" es2="2.0"> + <function name="GenBuffers" es1="1.1" es2="2.0" no_error="true"> <param name="n" type="GLsizei" counter="true"/> <param name="buffer" type="GLuint *" output="true" count="n"/> <glx ignore="true"/> 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 @@ -1479,6 +1479,14 @@ create_buffers_err(struct gl_context *ctx, GLsizei n, GLuint *buffers, bool dsa) * \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) { GET_CURRENT_CONTEXT(ctx); @@ -1492,6 +1500,14 @@ _mesa_GenBuffers(GLsizei n, GLuint *buffers) * \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) { GET_CURRENT_CONTEXT(ctx); 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 @@ -165,9 +165,15 @@ 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); GLboolean GLAPIENTRY |