summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-26 17:46:39 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-28 10:25:13 +0200
commite529ade0ea5dd47d2943eedc012f30eb5671b55d (patch)
tree34e92dd26f323274f13855e93278ce64c3dd94f7
parent34e8d0e4baedeb658b87d64577f6acc766b3f51f (diff)
mesa: add KHR_no_error support for glClear()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
-rw-r--r--src/mapi/glapi/gen/gl_API.xml2
-rw-r--r--src/mesa/main/clear.c8
-rw-r--r--src/mesa/main/clear.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 64078c44166..85083a428da 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2291,7 +2291,7 @@
<glx rop="126"/>
</function>
- <function name="Clear" es1="1.0" es2="2.0">
+ <function name="Clear" es1="1.0" es2="2.0" no_error="true">
<param name="mask" type="GLbitfield"/>
<glx rop="127"/>
</function>
diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index 1b07a756ee4..3adbe381854 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -224,6 +224,14 @@ clear(struct gl_context *ctx, GLbitfield mask, bool no_error)
void GLAPIENTRY
+_mesa_Clear_no_error(GLbitfield mask)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ clear(ctx, mask, true);
+}
+
+
+void GLAPIENTRY
_mesa_Clear(GLbitfield mask)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/clear.h b/src/mesa/main/clear.h
index fb3bcdeefbf..6ae63ac257a 100644
--- a/src/mesa/main/clear.h
+++ b/src/mesa/main/clear.h
@@ -43,6 +43,8 @@ _mesa_ClearColorIiEXT(GLint r, GLint g, GLint b, GLint a);
extern void GLAPIENTRY
_mesa_ClearColorIuiEXT(GLuint r, GLuint g, GLuint b, GLuint a);
+void GLAPIENTRY
+_mesa_Clear_no_error(GLbitfield mask);
extern void GLAPIENTRY
_mesa_Clear( GLbitfield mask );