summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-06-26 14:16:41 +0200
committerSamuel Pitoiset <[email protected]>2017-06-28 10:25:13 +0200
commit78d3510f0c13a67a674e350e2b423b0b294a8b73 (patch)
treec903bf46939cecb0b49c82d618ca455e1f93681b
parentb87a2cbec41e7fbf5514f0e6347eaa3ee1490f59 (diff)
mesa: add KHR_no_error support for glCheckFramebufferStatus()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mapi/glapi/gen/ARB_framebuffer_object.xml2
-rw-r--r--src/mesa/main/fbobject.c10
-rw-r--r--src/mesa/main/fbobject.h3
3 files changed, 14 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
index eda9fde8cd9..b8fff926207 100644
--- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml
+++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
@@ -212,7 +212,7 @@
<glx vendorpriv="1426" always_array="true"/>
</function>
- <function name="CheckFramebufferStatus" es2="2.0">
+ <function name="CheckFramebufferStatus" es2="2.0" no_error="true">
<param name="target" type="GLenum"/>
<return type="GLenum"/>
<glx vendorpriv="1427"/>
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 88449380229..7c92df56080 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2849,6 +2849,16 @@ _mesa_check_framebuffer_status(struct gl_context *ctx,
GLenum GLAPIENTRY
+_mesa_CheckFramebufferStatus_no_error(GLenum target)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct gl_framebuffer *fb = get_framebuffer_target(ctx, target);
+ return _mesa_check_framebuffer_status(ctx, fb);
+}
+
+
+GLenum GLAPIENTRY
_mesa_CheckFramebufferStatus(GLenum target)
{
struct gl_framebuffer *fb;
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 57e3959dad1..6e10c187427 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -215,6 +215,9 @@ _mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers);
extern void GLAPIENTRY
_mesa_CreateFramebuffers(GLsizei n, GLuint *framebuffers);
+GLenum GLAPIENTRY
+_mesa_CheckFramebufferStatus_no_error(GLenum target);
+
extern GLenum GLAPIENTRY
_mesa_CheckFramebufferStatus(GLenum target);