summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-26 18:27:49 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-28 10:25:13 +0200
commitb87a2cbec41e7fbf5514f0e6347eaa3ee1490f59 (patch)
tree7d8c89327b426ffb60068fc8e79b2ecf420f4628 /src
parentbeb74c9b87b90a4a10c9c4b26191d3d2ebd973d6 (diff)
mesa: add KHR_no_error support for gl*Renderbuffers()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/ARB_direct_state_access.xml2
-rw-r--r--src/mapi/glapi/gen/ARB_framebuffer_object.xml2
-rw-r--r--src/mesa/main/fbobject.c16
-rw-r--r--src/mesa/main/fbobject.h6
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 444d59d7098..bd94e8e42c5 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -283,7 +283,7 @@
<!-- Renderbuffer object functions -->
- <function name="CreateRenderbuffers">
+ <function name="CreateRenderbuffers" no_error="true">
<param name="n" type="GLsizei" />
<param name="renderbuffers" type="GLuint *" />
</function>
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
index 26f495f8bb9..eda9fde8cd9 100644
--- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml
+++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
@@ -158,7 +158,7 @@
<glx rop="4317"/>
</function>
- <function name="GenRenderbuffers" es2="2.0">
+ <function name="GenRenderbuffers" es2="2.0" no_error="true">
<param name="n" type="GLsizei" counter="true"/>
<param name="renderbuffers" type="GLuint *" count="n" output="true"/>
<glx vendorpriv="1423" always_array="true"/>
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 4c312332079..88449380229 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1745,6 +1745,14 @@ create_render_buffers_err(struct gl_context *ctx, GLsizei n,
void GLAPIENTRY
+_mesa_GenRenderbuffers_no_error(GLsizei n, GLuint *renderbuffers)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ create_render_buffers(ctx, n, renderbuffers, false);
+}
+
+
+void GLAPIENTRY
_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
{
GET_CURRENT_CONTEXT(ctx);
@@ -1753,6 +1761,14 @@ _mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
void GLAPIENTRY
+_mesa_CreateRenderbuffers_no_error(GLsizei n, GLuint *renderbuffers)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ create_render_buffers(ctx, n, renderbuffers, true);
+}
+
+
+void GLAPIENTRY
_mesa_CreateRenderbuffers(GLsizei n, GLuint *renderbuffers)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 1c9056dae7e..57e3959dad1 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -152,9 +152,15 @@ _mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
extern void GLAPIENTRY
_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers);
+void GLAPIENTRY
+_mesa_GenRenderbuffers_no_error(GLsizei n, GLuint *renderbuffers);
+
extern void GLAPIENTRY
_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers);
+void GLAPIENTRY
+_mesa_CreateRenderbuffers_no_error(GLsizei n, GLuint *renderbuffers);
+
extern void GLAPIENTRY
_mesa_CreateRenderbuffers(GLsizei n, GLuint *renderbuffers);