summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-23 17:11:05 +0200
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2017-06-28 10:25:12 +0200
commitd700ade81a8a88bb6eb07f271ba9b554e73d27b8 (patch)
tree41913077867a4cd0fb2946531846010d16047373
parentac92b750022567c64c7ed72db3eaefe15ba670cd (diff)
mesa: add KHR_no_error support for glCullFace()
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/polygon.c8
-rw-r--r--src/mesa/main/polygon.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 415ed6a98bb..ba71d36451e 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -1961,7 +1961,7 @@
<glx rop="78"/>
</function>
- <function name="CullFace" es1="1.0" es2="2.0">
+ <function name="CullFace" es1="1.0" es2="2.0" no_error="true">
<param name="mode" type="GLenum"/>
<glx rop="79"/>
</function>
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index 13dca6d39cf..49a60e8e533 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -66,6 +66,14 @@ cull_face(struct gl_context *ctx, GLenum mode)
void GLAPIENTRY
+_mesa_CullFace_no_error(GLenum mode)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ cull_face(ctx, mode);
+}
+
+
+void GLAPIENTRY
_mesa_CullFace(GLenum mode)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h
index ceca848d6d4..78c7f711642 100644
--- a/src/mesa/main/polygon.h
+++ b/src/mesa/main/polygon.h
@@ -39,6 +39,9 @@ struct gl_context;
extern void GLAPIENTRY
_mesa_GetnPolygonStippleARB( GLsizei bufSize, GLubyte *dest );
+void GLAPIENTRY
+_mesa_CullFace_no_error(GLenum mode);
+
extern void GLAPIENTRY
_mesa_CullFace(GLenum mode);